Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-09-22 01:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'marc1006-mobile'

Browse source
This commit is contained in:
Lauri Ojansivu 2020-04-25 01:41:37 +03:00
commit 7263d7497f
8 changed files with 21 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/components/boards/boardBody.js
View file

@ -205,7 +205,7 @@ BlazeComponent.extendComponent({
} else { } else {
showDesktopDragHandles = false; showDesktopDragHandles = false;
} }
if (!Utils.isMiniScreen() && showDesktopDragHandles) { if (Utils.isMiniScreen() || showDesktopDragHandles) {
$swimlanesDom.sortable({ $swimlanesDom.sortable({
handle: '.js-swimlane-header-handle', handle: '.js-swimlane-header-handle',
}); });
@ -215,9 +215,8 @@ BlazeComponent.extendComponent({
}); });
} }
// Disable drag-dropping if the current user is not a board member or is miniscreen // Disable drag-dropping if the current user is not a board member
$swimlanesDom.sortable('option', 'disabled', !userIsMember()); $swimlanesDom.sortable('option', 'disabled', !userIsMember());
$swimlanesDom.sortable('option', 'disabled', Utils.isMiniScreen());
}); });
function userIsMember() { function userIsMember() {

15
client/components/cards/cardDetails.js
View file

@ -278,17 +278,12 @@ BlazeComponent.extendComponent({
// Disable sorting if the current user is not a board member // Disable sorting if the current user is not a board member
this.autorun(() => { this.autorun(() => {
if ($checklistsDom.data('sortable')) { const disabled = !userIsMember() || Utils.isMiniScreen();
$checklistsDom.sortable('option', 'disabled', !userIsMember()); if ($checklistsDom.data('uiSortable')) {
$checklistsDom.sortable('option', 'disabled', disabled);
} }
if ($subtasksDom.data('sortable')) { if ($subtasksDom.data('uiSortable')) {
$subtasksDom.sortable('option', 'disabled', !userIsMember()); $subtasksDom.sortable('option', 'disabled', disabled);
}
if ($checklistsDom.data('sortable')) {
$checklistsDom.sortable('option', 'disabled', Utils.isMiniScreen());
}
if ($subtasksDom.data('sortable')) {
$subtasksDom.sortable('option', 'disabled', Utils.isMiniScreen());
} }
}); });
}, },

7
client/components/cards/checklists.js
View file

@ -57,11 +57,8 @@ BlazeComponent.extendComponent({
// Disable sorting if the current user is not a board member // Disable sorting if the current user is not a board member
self.autorun(() => { self.autorun(() => {
const $itemsDom = $(self.itemsDom); const $itemsDom = $(self.itemsDom);
if ($itemsDom.data('sortable')) { if ($itemsDom.data('uiSortable')) {
$(self.itemsDom).sortable('option', 'disabled', !userIsMember()); $(self.itemsDom).sortable('option', 'disabled', !userIsMember() || Utils.isMiniScreen());
}
if ($itemsDom.data('sortable')) {
$(self.itemsDom).sortable('option', 'disabled', Utils.isMiniScreen());
} }
}); });
}, },

4
client/components/cards/minicard.jade
View file

@ -4,8 +4,8 @@ template(name="minicard")
class="{{#if isLinkedBoard}}linked-board{{/if}}" class="{{#if isLinkedBoard}}linked-board{{/if}}"
class="minicard-{{colorClass}}") class="minicard-{{colorClass}}")
if isMiniScreen if isMiniScreen
//.handle .handle
// .fa.fa-arrows .fa.fa-arrows
unless isMiniScreen unless isMiniScreen
if showDesktopDragHandles if showDesktopDragHandles
.handle .handle

17
client/components/lists/list.js
View file

@ -129,7 +129,7 @@ BlazeComponent.extendComponent({
showDesktopDragHandles = false; showDesktopDragHandles = false;
} }
if (!Utils.isMiniScreen() && showDesktopDragHandles) { if (Utils.isMiniScreen() || showDesktopDragHandles) {
$cards.sortable({ $cards.sortable({
handle: '.handle', handle: '.handle',
}); });
@ -139,27 +139,16 @@ BlazeComponent.extendComponent({
}); });
} }
if ($cards.data('sortable')) { if ($cards.data('uiSortable')) {
$cards.sortable( $cards.sortable(
'option', 'option',
'disabled', 'disabled',
// Disable drag-dropping when user is not member/is miniscreen // Disable drag-dropping when user is not member
!userIsMember(), !userIsMember(),
// Not disable drag-dropping while in multi-selection mode // Not disable drag-dropping while in multi-selection mode
// MultiSelection.isActive() || !userIsMember(), // MultiSelection.isActive() || !userIsMember(),
); );
} }
if ($cards.data('sortable')) {
$cards.sortable(
'option',
'disabled',
// Disable drag-dropping when user is not member/is miniscreen
Utils.isMiniScreen(),
// Not disable drag-dropping while in multi-selection mode
// MultiSelection.isActive() || !userIsMember(),
);
}
}); });
// We want to re-run this function any time a card is added. // We want to re-run this function any time a card is added.

3
client/components/lists/listHeader.jade
View file

@ -30,10 +30,9 @@ template(name="listHeader")
if canSeeAddCard if canSeeAddCard
a.js-add-card.fa.fa-plus.list-header-plus-icon a.js-add-card.fa.fa-plus.list-header-plus-icon
a.fa.fa-navicon.js-open-list-menu a.fa.fa-navicon.js-open-list-menu
//a.list-header-handle.handle.fa.fa-arrows.js-list-handle
else else
a.list-header-menu-icon.fa.fa-angle-right.js-select-list a.list-header-menu-icon.fa.fa-angle-right.js-select-list
//a.list-header-handle.handle.fa.fa-arrows.js-list-handle a.list-header-handle.handle.fa.fa-arrows.js-list-handle
else if currentUser.isBoardMember else if currentUser.isBoardMember
if isWatching if isWatching
i.list-header-watch-icon.fa.fa-eye i.list-header-watch-icon.fa.fa-eye

1
client/components/main/popup.styl
View file

@ -320,6 +320,7 @@ $popupWidth = 300px
input[type="file"] input[type="file"]
margin: 4px 0 12px margin: 4px 0 12px
width: 100% width: 100%
box-sizing: border-box
.pop-over-list .pop-over-list
li > a li > a

33
client/components/swimlanes/swimlanes.js
View file

@ -111,7 +111,7 @@ function initSortable(boardComponent, $listsDom) {
showDesktopDragHandles = false; showDesktopDragHandles = false;
} }
if (!Utils.isMiniScreen() && showDesktopDragHandles) { if (Utils.isMiniScreen() || showDesktopDragHandles) {
$listsDom.sortable({ $listsDom.sortable({
handle: '.js-list-handle', handle: '.js-list-handle',
}); });
@ -122,34 +122,12 @@ function initSortable(boardComponent, $listsDom) {
} }
const $listDom = $listsDom; const $listDom = $listsDom;
if ($listDom.data('sortable')) { if ($listDom.data('uiSortable')) {
$listsDom.sortable( $listsDom.sortable(
'option', 'option',
'disabled', 'disabled',
// Disable drag-dropping when user is not member/is worker/is miniscreen // Disable drag-dropping when user is not member/is worker
!userIsMember(), !userIsMember() || Meteor.user().isWorker(),
// Not disable drag-dropping while in multi-selection mode
// MultiSelection.isActive() || !userIsMember(),
);
}
if ($listDom.data('sortable')) {
$listsDom.sortable(
'option',
'disabled',
// Disable drag-dropping when user is not member/is worker/is miniscreen
Meteor.user().isWorker(),
// Not disable drag-dropping while in multi-selection mode
// MultiSelection.isActive() || !userIsMember(),
);
}
if ($listDom.data('sortable')) {
$listsDom.sortable(
'option',
'disabled',
// Disable drag-dropping when user is not member/is worker/is miniscreen
Utils.isMiniScreen(),
// Not disable drag-dropping while in multi-selection mode // Not disable drag-dropping while in multi-selection mode
// MultiSelection.isActive() || !userIsMember(), // MultiSelection.isActive() || !userIsMember(),
); );
@ -210,8 +188,7 @@ BlazeComponent.extendComponent({
} }
const noDragInside = ['a', 'input', 'textarea', 'p'].concat( const noDragInside = ['a', 'input', 'textarea', 'p'].concat(
Utils.isMiniScreen() || Utils.isMiniScreen() || showDesktopDragHandles
(!Utils.isMiniScreen() && showDesktopDragHandles)
? ['.js-list-handle', '.js-swimlane-header-handle'] ? ['.js-list-handle', '.js-swimlane-header-handle']
: ['.js-list-header'], : ['.js-list-header'],
); );