From c3cccfc66ec4481959941fea25340595280cdfa2 Mon Sep 17 00:00:00 2001 From: Ghassen Rjab Date: Sun, 24 Sep 2017 02:15:33 +0100 Subject: Update Checklists client Use new methods added in Checklist model --- client/components/cards/checklists.jade | 2 +- client/components/cards/checklists.js | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'client') diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index 7ecc5dd3..e1dd1d14 100644 --- a/client/components/cards/checklists.jade +++ b/client/components/cards/checklists.jade @@ -47,7 +47,7 @@ template(name="editChecklistItemForm") template(name="checklistItems") .checklist-items.js-checklist-items - each item in checklist.getItems + each item in checklist.getItemsSorted +inlinedForm(classNames="js-edit-checklist-item" item = item checklist = checklist) +editChecklistItemForm(type = 'item' item = item checklist = checklist) else diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index bd9d275a..ba3384a9 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -20,24 +20,26 @@ function initSorting(items) { }); items.sortable('cancel'); const formerParent = ui.item.parents('.js-checklist-items'); - let checklist = Blaze.getData(parent.get(0)).checklist; + const checklist = Blaze.getData(parent.get(0)).checklist; const oldChecklist = Blaze.getData(formerParent.get(0)).checklist; if (oldChecklist._id !== checklist._id) { const currentItem = Blaze.getData(ui.item.get(0)).item; for (let i = 0; i < orderedItems.length; i++) { - let itemId = orderedItems[i]; + const itemId = orderedItems[i]; if (itemId !== currentItem._id) continue; - checklist.addItem(currentItem.title); - checklist = Checklists.findOne({_id: checklist._id}); - itemId = checklist._id + (checklist.newItemIndex - 1); - if (currentItem.finished) { - checklist.finishItem(itemId); - } - orderedItems[i] = itemId; - oldChecklist.removeItem(currentItem._id); + const newItem = { + _id: checklist.getNewItemId(), + title: currentItem.title, + sort: i, + isFinished: currentItem.isFinished, + }; + checklist.addFullItem(newItem); + orderedItems[i] = currentItem._id; + oldChecklist.removeItem(itemId); } + } else { + checklist.sortItems(orderedItems); } - checklist.sortItems(orderedItems); }, }); } -- cgit v1.2.3-1-g7c22 From 3fa969eb2621e9e92e0267c5098d339eead9d582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Orlick=C3=BD?= Date: Sun, 24 Sep 2017 15:17:14 +0200 Subject: #1233 Added plus button to add card on top of the list --- client/components/lists/list.styl | 5 ++++- client/components/lists/listHeader.jade | 7 ++++--- client/components/lists/listHeader.js | 15 +++++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) (limited to 'client') diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl index cf939a6e..5e20476e 100644 --- a/client/components/lists/list.styl +++ b/client/components/lists/list.styl @@ -69,13 +69,16 @@ padding-left: 10px color: #a6a6a6 - .list-header-menu-icon + .list-header-menu position: absolute padding: 7px margin-top: 1px top: -@padding right: -@padding + .list-header-plus-icon + color: #a6a6a6 + .list-body flex: 1 display: flex diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 11905586..68336320 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -13,7 +13,9 @@ template(name="listHeader") if currentUser.isBoardMember if isWatching i.list-header-watch-icon.fa.fa-eye - a.list-header-menu-icon.fa.fa-navicon.js-open-list-menu + div.list-header-menu + a.js-add-card.fa.fa-plus.list-header-plus-icon + a.fa.fa-navicon.js-open-list-menu template(name="editListTitleForm") .list-composer @@ -28,10 +30,9 @@ template(name="listActionPopup") unless currentUser.isCommentOnly hr ul.pop-over-list - li: a.js-add-card {{_ 'add-card'}} if cards.count li: a.js-select-cards {{_ 'list-select-cards'}} - hr + hr ul.pop-over-list li: a.js-close-list {{_ 'archive-list'}} hr diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index 1ad9f9dd..7fe42884 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -24,6 +24,13 @@ BlazeComponent.extendComponent({ events() { return [{ 'click .js-open-list-menu': Popup.open('listAction'), + 'click .js-add-card' () { + const listDom = document.getElementById(`js-list-${this.currentData()._id}`); + const listComponent = BlazeComponent.getComponentForElement(listDom); + listComponent.openForm({ + position: 'top', + }); + }, submit: this.editTitle, }]; }, @@ -36,14 +43,6 @@ Template.listActionPopup.helpers({ }); Template.listActionPopup.events({ - 'click .js-add-card' () { - const listDom = document.getElementById(`js-list-${this._id}`); - const listComponent = BlazeComponent.getComponentForElement(listDom); - listComponent.openForm({ - position: 'top', - }); - Popup.close(); - }, 'click .js-list-subscribe' () {}, 'click .js-select-cards' () { const cardIds = this.allCards().map((card) => card._id); -- cgit v1.2.3-1-g7c22 From c4fd729b34910cf247f0a7ddfd473e5040b0b6bf Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 25 Sep 2017 18:30:26 +0300 Subject: Remove emoji support, because it breaks MAC addresses, urls, code etc. Thanks to xet7 ! Closes #1248, closes #743, closes #643, closes #323 --- client/components/main/editor.jade | 5 ++--- client/components/main/editor.js | 19 ------------------- 2 files changed, 2 insertions(+), 22 deletions(-) (limited to 'client') diff --git a/client/components/main/editor.jade b/client/components/main/editor.jade index f10d64a1..31f533e6 100644 --- a/client/components/main/editor.jade +++ b/client/components/main/editor.jade @@ -9,6 +9,5 @@ template(name="editor") template(name="viewer") .viewer +mentions - +emoji - +markdown - {{> UI.contentBlock }} + +markdown + {{> UI.contentBlock }} diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 5987b772..ea24f518 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -4,25 +4,6 @@ Template.editor.onRendered(() => { autosize($textarea); $textarea.escapeableTextComplete([ - // Emoji - { - match: /\B:([\-+\w]*)$/, - search(term, callback) { - callback(Emoji.values.map((emoji) => { - return emoji.includes(term) ? emoji : null; - }).filter(Boolean)); - }, - template(value) { - const imgSrc = Emoji.baseImagePath + value; - const image = ``; - return image + value; - }, - replace(value) { - return `:${value}:`; - }, - index: 1, - }, - // User mentions { match: /\B@([\w.]*)$/, -- cgit v1.2.3-1-g7c22 From a62c8eb5a02b838e0eed809032cba31f64a122c0 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 25 Sep 2017 19:40:41 +0300 Subject: Add emojis back, because removing them broke local dev Sandstorm. Thanks to xet7 ! Opens #1248, opens #743, opens #643, opens #323 --- client/components/main/editor.jade | 5 +++-- client/components/main/editor.js | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/client/components/main/editor.jade b/client/components/main/editor.jade index 31f533e6..f10d64a1 100644 --- a/client/components/main/editor.jade +++ b/client/components/main/editor.jade @@ -9,5 +9,6 @@ template(name="editor") template(name="viewer") .viewer +mentions - +markdown - {{> UI.contentBlock }} + +emoji + +markdown + {{> UI.contentBlock }} diff --git a/client/components/main/editor.js b/client/components/main/editor.js index ea24f518..5987b772 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -4,6 +4,25 @@ Template.editor.onRendered(() => { autosize($textarea); $textarea.escapeableTextComplete([ + // Emoji + { + match: /\B:([\-+\w]*)$/, + search(term, callback) { + callback(Emoji.values.map((emoji) => { + return emoji.includes(term) ? emoji : null; + }).filter(Boolean)); + }, + template(value) { + const imgSrc = Emoji.baseImagePath + value; + const image = ``; + return image + value; + }, + replace(value) { + return `:${value}:`; + }, + index: 1, + }, + // User mentions { match: /\B@([\w.]*)$/, -- cgit v1.2.3-1-g7c22