diff options
author | Maxime Quandalle <maxime@quandalle.com> | 2015-10-20 20:06:26 +0200 |
---|---|---|
committer | Maxime Quandalle <maxime@quandalle.com> | 2015-10-20 20:06:26 +0200 |
commit | 7a5f030cc807c6a0a5addd8da59dc853dd4bd426 (patch) | |
tree | 784e5197277b8971eced858e1be9efb88b973cfd /client/components/lists | |
parent | f3fc154eb0cf25c46871510a0d4004037188ec15 (diff) | |
parent | 118b434a5aad35df8eefea85624ab9abafab56f0 (diff) | |
download | wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.tar.gz wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.tar.bz2 wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.zip |
Merge branch 'xavierpriour-devel' into devel
Conflicts:
models/import.js
Diffstat (limited to 'client/components/lists')
-rw-r--r-- | client/components/lists/listHeader.jade | 9 | ||||
-rw-r--r-- | client/components/lists/listHeader.js | 39 |
2 files changed, 0 insertions, 48 deletions
diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index e7b16912..72cd0fe9 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -31,15 +31,6 @@ template(name="listActionPopup") template(name="listMoveCardsPopup") +boardLists -template(name="listImportCardPopup") - if error.get - .warning {{_ error.get}} - form - label - | {{_ 'card-json'}} - textarea.js-card-json(placeholder="{{_ 'card-json-placeholder'}}" autofocus) - input.primary.wide(type="submit" value="{{_ 'import'}}") - template(name="boardLists") ul.pop-over-list each currentBoard.lists diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index e34d23fd..4f5fc3a0 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -49,45 +49,6 @@ Template.listActionPopup.events({ }, }); - -BlazeComponent.extendComponent({ - events() { - return [{ - 'submit': (evt) => { - evt.preventDefault(); - const jsonData = $(evt.currentTarget).find('textarea').val(); - const firstCardDom = $(`#js-list-${this.currentData()._id} .js-minicard:first`).get(0); - const sortIndex = Utils.calculateIndex(null, firstCardDom).base; - let trelloCard; - try { - trelloCard = JSON.parse(jsonData); - } catch (e) { - this.setError('error-json-malformed'); - return; - } - Meteor.call('importTrelloCard', trelloCard, this.currentData()._id, sortIndex, - (error, response) => { - if (error) { - this.setError(error.error); - } else { - Filter.addException(response); - Popup.close(); - } - } - ); - }, - }]; - }, - - onCreated() { - this.error = new ReactiveVar(''); - }, - - setError(error) { - this.error.set(error); - }, -}).register('listImportCardPopup'); - Template.listMoveCardsPopup.events({ 'click .js-select-list'() { const fromList = Template.parentData(2).data; |