Преглед на файлове

Merge pull request #4087 from mfilser/fix_labels_desktop_view_add_and_delete

Fix labels desktop view add and delete
Lauri Ojansivu преди 3 години
родител
ревизия
46f6d1e989
променени са 2 файла, в които са добавени 5 реда и са изтрити 2 реда
  1. 2 2
      client/components/cards/labels.js
  2. 3 0
      client/components/cards/labels.styl

+ 2 - 2
client/components/cards/labels.js

@@ -67,7 +67,7 @@ BlazeComponent.extendComponent({
 
 
     // Disable drag-dropping if the current user is not a board member or is comment only
     // Disable drag-dropping if the current user is not a board member or is comment only
     this.autorun(() => {
     this.autorun(() => {
-      if (Utils.isMiniScreen()) {
+      if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
         $labels.sortable({
         $labels.sortable({
           handle: '.label-handle',
           handle: '.label-handle',
         });
         });
@@ -79,7 +79,7 @@ BlazeComponent.extendComponent({
       {
       {
         'click .js-select-label'(event) {
         'click .js-select-label'(event) {
           const card = Utils.getCurrentCard();
           const card = Utils.getCurrentCard();
-          const labelId = this._id;
+          const labelId = this.currentData()._id;
           card.toggleLabel(labelId);
           card.toggleLabel(labelId);
           event.preventDefault();
           event.preventDefault();
         },
         },

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

@@ -225,3 +225,6 @@
 ul.edit-labels-pop-over
 ul.edit-labels-pop-over
   span.fa.label-handle
   span.fa.label-handle
     padding-right: 10px;
     padding-right: 10px;
+
+  span.fa.label-handle + .card-label
+    max-width: 180px