From ac07646749d9838e70c728232078164551309ce5 Mon Sep 17 00:00:00 2001 From: Joel Louzado Date: Wed, 22 Feb 2017 17:33:17 +0530 Subject: New component for use in header-bar --- client/components/boards/boardHeader.jade | 2 +- client/components/boards/boardHeader.js | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index 033d240a..599ad20a 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -170,7 +170,7 @@ template(name="boardChangeColorPopup") if isSelected i.fa.fa-check -template(name="createBoardPopup") +template(name="createBoard") form label | {{_ 'title'}} diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index a76b566a..7c57ef42 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -119,10 +119,15 @@ BlazeComponent.extendComponent({ }, }).register('boardChangeColorPopup'); -BlazeComponent.extendComponent({ +const CreateBoard = BlazeComponent.extendComponent({ + template() { + return 'createBoard'; + }, + onCreated() { this.visibilityMenuIsOpen = new ReactiveVar(false); this.visibility = new ReactiveVar('private'); + const boardId = ''; }, visibilityCheck() { @@ -143,15 +148,12 @@ BlazeComponent.extendComponent({ const title = this.find('.js-new-board-title').value; const visibility = this.visibility.get(); - const boardId = Boards.insert({ + boardId = Boards.insert({ title, permission: visibility, }); Utils.goBoardId(boardId); - - // Immediately star boards crated with the headerbar popup. - Meteor.user().toggleBoardStar(boardId); }, events() { @@ -166,6 +168,14 @@ BlazeComponent.extendComponent({ }, }).register('createBoardPopup'); +(class HeaderBarCreateBoard extends CreateBoard { + onSubmit(evt) { + super.onSubmit(evt); + // Immediately star boards crated with the headerbar popup. + Meteor.user().toggleBoardStar(boardId); + } +}).register('headerBarCreateBoardPopup') + BlazeComponent.extendComponent({ visibilityCheck() { const currentBoard = Boards.findOne(Session.get('currentBoard')); -- cgit v1.2.3-1-g7c22 From 02e381f6942ef8312a0d611c8deb6b393183ec37 Mon Sep 17 00:00:00 2001 From: Joel Louzado Date: Wed, 22 Feb 2017 17:34:57 +0530 Subject: invoke new component from headerBar --- client/components/main/header.js | 2 +- i18n/en.i18n.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/client/components/main/header.js b/client/components/main/header.js index 0337c72b..49acbfef 100644 --- a/client/components/main/header.js +++ b/client/components/main/header.js @@ -13,5 +13,5 @@ Template.header.helpers({ }); Template.header.events({ - 'click .js-create-board': Popup.open('createBoard'), + 'click .js-create-board': Popup.open('headerBarCreateBoard'), }); diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index b6c98152..ad74a0e0 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -196,6 +196,7 @@ "fullname": "Full Name", "header-logo-title": "Go back to your boards page.", "hide-system-messages": "Hide system messages", + "headerBarCreateBoardPopup-title": "Create Board", "home": "Home", "import": "Import", "import-board": "import from Trello", -- cgit v1.2.3-1-g7c22 From b2e950540fe6ab973c812db55b5afd0681735c3d Mon Sep 17 00:00:00 2001 From: Joel Louzado Date: Wed, 22 Feb 2017 18:59:51 +0530 Subject: changes for lint warnings --- client/components/boards/boardHeader.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index 7c57ef42..9b03ab56 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -127,7 +127,7 @@ const CreateBoard = BlazeComponent.extendComponent({ onCreated() { this.visibilityMenuIsOpen = new ReactiveVar(false); this.visibility = new ReactiveVar('private'); - const boardId = ''; + this.boardId = new ReactiveVar(''); }, visibilityCheck() { @@ -148,12 +148,12 @@ const CreateBoard = BlazeComponent.extendComponent({ const title = this.find('.js-new-board-title').value; const visibility = this.visibility.get(); - boardId = Boards.insert({ + this.boardId.set(Boards.insert({ title, permission: visibility, - }); + })); - Utils.goBoardId(boardId); + Utils.goBoardId(this.boardId.get()); }, events() { @@ -172,9 +172,9 @@ const CreateBoard = BlazeComponent.extendComponent({ onSubmit(evt) { super.onSubmit(evt); // Immediately star boards crated with the headerbar popup. - Meteor.user().toggleBoardStar(boardId); + Meteor.user().toggleBoardStar(this.boardId.get()); } -}).register('headerBarCreateBoardPopup') +}).register('headerBarCreateBoardPopup'); BlazeComponent.extendComponent({ visibilityCheck() { -- cgit v1.2.3-1-g7c22