Merge branch 'master' into devel

3 files changed, 11 insertions, 2 deletions

diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index 980a9015..95590beb 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -68,7 +68,13 @@ BlazeComponent.extendComponent({
 
       // Click-and-drag action
       'mousedown .board-canvas'(evt) {
-        if ($(evt.target).closest('a,.js-list-header').length === 0) {
+        // Translating the board canvas using the click-and-drag action can
+        // conflict with the build-in browser mechanism to select text. We
+        // define a list of elements in which we disable the dragging because
+        // the user will legitimately expect to be able to select some text with
+        // his mouse.
+        const noDragInside = ['a', 'input', 'textarea', 'p', '.js-list-header'];
+        if ($(evt.target).closest(noDragInside.join(',')).length === 0) {
           this._isDragging = true;
           this._lastDragPositionX = evt.clientX;
         }
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index a493d938..6ea6e777 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -96,6 +96,9 @@ BlazeComponent.extendComponent({
   _getUnsavedEditKey() {
     return {
       fieldName: 'cardDescription',
+      // XXX Recovering the currentCard identifier form a session variable is
+      // fragile because this variable may change for instance if the route
+      // change. We should use some component props instead.
       docId: Session.get('currentCard'),
     };
   }
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade
index e7cd1159..7f7519c6 100644
--- a/client/components/sidebar/sidebar.jade
+++ b/client/components/sidebar/sidebar.jade
@@ -42,7 +42,7 @@ template(name="labelsWidget")
     .board-widget-content
       each currentBoard.labels
           a.card-label(class="card-label-{{color}}"
-            class="{{#if currentUser.isBoardMember}}js-add-labels{{/if}}")
+            class="{{#if currentUser.isBoardMember}}js-label{{/if}}")
             span.card-label-name= name
       if currentUser.isBoardAdmin
         a.card-label.add-label.js-add-label