diff options
| author | Maxime Quandalle <maxime@quandalle.com> | 2015-10-31 10:27:20 +0100 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2015-10-31 12:49:58 +0100 |
| commit | 2b134ff7a986eb97f8ec360321be284a7a8ea11e (patch) | |
| tree | 0ff579909b402db5916b66ec7bc7469534881a15 /client/components/cards/labels.js | |
| parent | 3507c6565bb16b5f45c6f269f7376902f8b1ff37 (diff) | |
| parent | 41b23f88aea0f421226f92b081cdb1b61c64bde4 (diff) | |
| download | wekan-2b134ff7a986eb97f8ec360321be284a7a8ea11e.tar.gz wekan-2b134ff7a986eb97f8ec360321be284a7a8ea11e.tar.bz2 wekan-2b134ff7a986eb97f8ec360321be284a7a8ea11e.zip | |
Merge branch 'devel' into minicard-editor
Conflicts:
client/components/lists/listBody.js
Diffstat (limited to 'client/components/cards/labels.js')
| -rw-r--r-- | client/components/cards/labels.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/components/cards/labels.js b/client/components/cards/labels.js index d2ee0140..4e61a0c6 100644 --- a/client/components/cards/labels.js +++ b/client/components/cards/labels.js @@ -13,7 +13,7 @@ BlazeComponent.extendComponent({ }, labels() { - return _.map(labelColors, (color) => { + return labelColors.map((color) => { return { color, name: '' }; }); }, @@ -69,12 +69,12 @@ Template.formLabel.events({ Template.createLabelPopup.events({ // Create the new label 'submit .create-label'(evt, tpl) { + evt.preventDefault(); const board = Boards.findOne(Session.get('currentBoard')); const name = tpl.$('#labelName').val().trim(); const color = Blaze.getData(tpl.find('.fa-check')).color; board.addLabel(name, color); Popup.back(); - evt.preventDefault(); }, }); |