diff options
author | Andrés Manelli <andresmanelli@gmail.com> | 2018-05-02 15:03:22 -0300 |
---|---|---|
committer | Andrés Manelli <andresmanelli@gmail.com> | 2018-08-11 00:17:42 +0200 |
commit | f76d8e47a859c64a99cfd460e3fd496965bf021a (patch) | |
tree | 2adc26b9ba11e906e8bffb8b097be005977b1ae3 /client/components/lists | |
parent | 6adfcb35138259c5969e63d20a68cd6f9e8c393c (diff) | |
download | wekan-f76d8e47a859c64a99cfd460e3fd496965bf021a.tar.gz wekan-f76d8e47a859c64a99cfd460e3fd496965bf021a.tar.bz2 wekan-f76d8e47a859c64a99cfd460e3fd496965bf021a.zip |
Refactor imported -> linked in components
Diffstat (limited to 'client/components/lists')
-rw-r--r-- | client/components/lists/list.styl | 4 | ||||
-rw-r--r-- | client/components/lists/listBody.jade | 12 | ||||
-rw-r--r-- | client/components/lists/listBody.js | 28 |
3 files changed, 22 insertions, 22 deletions
diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl index 0e170ebf..72cb19f4 100644 --- a/client/components/lists/list.styl +++ b/client/components/lists/list.styl @@ -188,11 +188,11 @@ top: -@padding right: 17px -.import-board-wrapper +.link-board-wrapper display: flex align-items: baseline - .js-import-board + .js-link-board margin-left: 15px .search-card-results diff --git a/client/components/lists/listBody.jade b/client/components/lists/listBody.jade index 419e158a..8069717e 100644 --- a/client/components/lists/listBody.jade +++ b/client/components/lists/listBody.jade @@ -36,7 +36,7 @@ template(name="addCardForm") button.primary.confirm(type="submit") {{_ 'add'}} span.quiet | {{_ 'or'}} - a.js-import {{_ 'import'}} + a.js-link {{_ 'link'}} span.quiet | | / @@ -46,16 +46,16 @@ template(name="autocompleteLabelLine") .minicard-label(class="card-label-{{colorName}}" title=labelName) span(class="{{#if hasNoName}}quiet{{/if}}")= labelName -template(name="importCardPopup") +template(name="linkCardPopup") label {{_ 'boards'}}: - .import-board-wrapper + .link-board-wrapper select.js-select-boards each boards if $eq _id currentBoard._id option(value="{{_id}}" selected) {{_ 'current'}} else option(value="{{_id}}") {{title}} - input.primary.confirm.js-import-board(type="button" value="{{_ 'import'}}") + input.primary.confirm.js-link-board(type="button" value="{{_ 'link'}}") label {{_ 'swimlanes'}}: select.js-select-swimlanes @@ -73,11 +73,11 @@ template(name="importCardPopup") option(value="{{_id}}") {{title}} .edit-controls.clearfix - input.primary.confirm.js-done(type="button" value="{{_ 'import'}}") + input.primary.confirm.js-done(type="button" value="{{_ 'link'}}") template(name="searchCardPopup") label {{_ 'boards'}}: - .import-board-wrapper + .link-board-wrapper select.js-select-boards each boards if $eq _id currentBoard._id diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js index 02e4ab7c..83592a64 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -200,7 +200,7 @@ BlazeComponent.extendComponent({ events() { return [{ keydown: this.pressKey, - 'click .js-import': Popup.open('importCard'), + 'click .js-link': Popup.open('linkCard'), 'click .js-search': Popup.open('searchCard'), }]; }, @@ -338,8 +338,8 @@ BlazeComponent.extendComponent({ swimlaneId: this.selectedSwimlaneId.get(), listId: this.selectedListId.get(), archived: false, - importedId: null, - _id: {$nin: this.board.cards().map((card) => { return card.importedId || card._id; })}, + linkedId: null, + _id: {$nin: this.board.cards().map((card) => { return card.linkedId || card._id; })}, }); }, @@ -356,7 +356,7 @@ BlazeComponent.extendComponent({ this.selectedListId.set($(evt.currentTarget).val()); }, 'click .js-done' (evt) { - // IMPORT CARD + // LINK CARD evt.stopPropagation(); evt.preventDefault(); const _id = Cards.insert({ @@ -365,14 +365,14 @@ BlazeComponent.extendComponent({ swimlaneId: this.swimlaneId, boardId: this.boardId, sort: Lists.findOne(this.listId).cards().count(), - type: 'cardType-importedCard', - importedId: $('.js-select-cards option:selected').val(), + type: 'cardType-linkedCard', + linkedId: $('.js-select-cards option:selected').val(), }); Filter.addException(_id); Popup.close(); }, - 'click .js-import-board' (evt) { - //IMPORT BOARD + 'click .js-link-board' (evt) { + //LINK BOARD evt.stopPropagation(); evt.preventDefault(); const impBoardId = $('.js-select-boards option:selected').val(); @@ -382,15 +382,15 @@ BlazeComponent.extendComponent({ swimlaneId: this.swimlaneId, boardId: this.boardId, sort: Lists.findOne(this.listId).cards().count(), - type: 'cardType-importedBoard', - importedId: impBoardId, + type: 'cardType-linkedBoard', + linkedId: impBoardId, }); Filter.addException(_id); Popup.close(); }, }]; }, -}).register('importCardPopup'); +}).register('linkCardPopup'); BlazeComponent.extendComponent({ mixins() { @@ -452,7 +452,7 @@ BlazeComponent.extendComponent({ this.term.set(evt.target.searchTerm.value); }, 'click .js-minicard'(evt) { - // IMPORT CARD + // LINK CARD const card = Blaze.getData(evt.currentTarget); const _id = Cards.insert({ title: card.title, //dummy @@ -460,8 +460,8 @@ BlazeComponent.extendComponent({ swimlaneId: this.swimlaneId, boardId: this.boardId, sort: Lists.findOne(this.listId).cards().count(), - type: 'cardType-importedCard', - importedId: card._id, + type: 'cardType-linkedCard', + linkedId: card._id, }); Filter.addException(_id); Popup.close(); |