Bladeren bron

Merge branch 'mfilser-drag_handle_checklistitem'

Lauri Ojansivu 4 jaren geleden
bovenliggende
commit
8dff6c2e2a

+ 2 - 0
client/components/cards/checklists.jade

@@ -103,6 +103,8 @@ template(name='checklistItemDetail')
       .check-box-container
         .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}")
       .item-title.js-open-inlined-form.is-editable(class="{{#if item.isFinished }}is-checked{{/if}}")
+        if isMiniScreenOrShowDesktopDragHandles
+          span.fa.checklistitem-handle(class="fa-arrows" title="{{_ 'dragChecklistItem'}}")
         +viewer
           = item.title
     else

+ 7 - 1
client/components/cards/checklists.js

@@ -58,8 +58,14 @@ BlazeComponent.extendComponent({
         $(self.itemsDom).sortable(
           'option',
           'disabled',
-          !userIsMember() || Utils.isMiniScreen(),
+          !userIsMember(),
         );
+        if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
+          $(self.itemsDom).sortable({
+            handle: 'span.fa.checklistitem-handle',
+            appendTo: 'parent',
+          });
+        }
       }
     });
   },

+ 3 - 0
client/components/cards/checklists.styl

@@ -156,6 +156,9 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
         word-wrap: break-word
         max-width: 420px
 
+  span.fa.checklistitem-handle
+    float: right
+
 .js-delete-checklist-item
   margin: 0 0 0.5em 1.33em
   @extends .delete-text