summaryrefslogtreecommitdiffstats
path: root/client/components/swimlanes
diff options
context:
space:
mode:
Diffstat (limited to 'client/components/swimlanes')
-rw-r--r--client/components/swimlanes/swimlaneHeader.jade7
-rw-r--r--client/components/swimlanes/swimlanes.js35
-rw-r--r--client/components/swimlanes/swimlanes.styl8
3 files changed, 32 insertions, 18 deletions
diff --git a/client/components/swimlanes/swimlaneHeader.jade b/client/components/swimlanes/swimlaneHeader.jade
index fb6ef21d..dde8561e 100644
--- a/client/components/swimlanes/swimlaneHeader.jade
+++ b/client/components/swimlanes/swimlaneHeader.jade
@@ -16,8 +16,11 @@ template(name="swimlaneFixedHeader")
unless currentUser.isCommentOnly
a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon
a.fa.fa-navicon.js-open-swimlane-menu
- if showDesktopDragHandles
- a.swimlane-header-menu-handle.handle.fa.fa-arrows.js-swimlane-header-handle
+ if isMiniScreen
+ a.swimlane-header-menu-miniscreen-handle.handle.fa.fa-arrows.js-swimlane-header-handle
+ unless isMiniScreen
+ if showDesktopDragHandles
+ a.swimlane-header-menu-handle.handle.fa.fa-arrows.js-swimlane-header-handle
template(name="editSwimlaneTitleForm")
.list-composer
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js
index 2c916e4d..8953eb05 100644
--- a/client/components/swimlanes/swimlanes.js
+++ b/client/components/swimlanes/swimlanes.js
@@ -53,22 +53,9 @@ function initSortable(boardComponent, $listsDom) {
},
};
- if (Utils.isMiniScreen) {
- $listsDom.sortable({
- handle: '.js-list-handle',
- });
- }
-
- if (!Utils.isMiniScreen && showDesktopDragHandles) {
- $listsDom.sortable({
- handle: '.js-list-header',
- });
- }
-
$listsDom.sortable({
tolerance: 'pointer',
helper: 'clone',
- handle: '.js-list-header',
items: '.js-list:not(.js-list-composer)',
placeholder: 'list placeholder',
distance: 7,
@@ -113,6 +100,22 @@ function initSortable(boardComponent, $listsDom) {
// is not a board member
boardComponent.autorun(() => {
const $listDom = $listsDom;
+
+ if (Utils.isMiniScreen) {
+ $listsDom.sortable({
+ handle: '.js-list-handle',
+ });
+ }
+
+ if (!Utils.isMiniScreen && showDesktopDragHandles) {
+ $listsDom.sortable({
+ handle: '.js-list-header',
+ });
+ }
+
+
+
+
if ($listDom.data('sortable')) {
$listsDom.sortable(
'option',
@@ -165,7 +168,7 @@ BlazeComponent.extendComponent({
// his mouse.
if (Utils.isMiniScreen) {
- const noDragInside = [
+ noDragInside = [
'a',
'input',
'textarea',
@@ -176,7 +179,7 @@ BlazeComponent.extendComponent({
}
if (!Utils.isMiniScreen && !showDesktopDragHandles) {
- const noDragInside = [
+ noDragInside = [
'a',
'input',
'textarea',
@@ -186,7 +189,7 @@ BlazeComponent.extendComponent({
}
if (!Utils.isMiniScreen && showDesktopDragHandles) {
- const noDragInside = [
+ noDragInside = [
'a',
'input',
'textarea',
diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl
index 503091ee..4fbfce4f 100644
--- a/client/components/swimlanes/swimlanes.styl
+++ b/client/components/swimlanes/swimlanes.styl
@@ -58,6 +58,14 @@
left: 300px
font-size: 18px
+ .swimlane-header-menu-miniscreen-handle
+ position: absolute
+ padding: 7px
+ top: 50%
+ transform: translateY(-50%)
+ left: 487px
+ font-size: 18px
+
.list-group
height: 100%