Merge branch 'master' into devel

This commit is contained in:
Maxime Quandalle 2015-09-10 19:25:15 +02:00
commit 0f014c954c
11 changed files with 100 additions and 61 deletions

View file

@ -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;
}

View file

@ -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'),
};
}

View file

@ -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