summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-06-04 16:22:01 +0200
committerMaxime Quandalle <maxime@quandalle.com>2015-06-04 16:22:01 +0200
commit97807abd709f4355964b52105c0931d6671ff20b (patch)
tree49990c24cee345eca02a59439188c206095e7791 /client/components
parent5d1c6b63becf7885be6945229bbc9e6a0a57b66b (diff)
downloadwekan-97807abd709f4355964b52105c0931d6671ff20b.tar.gz
wekan-97807abd709f4355964b52105c0931d6671ff20b.tar.bz2
wekan-97807abd709f4355964b52105c0931d6671ff20b.zip
Dissable temporarily the cache value of inlinedForm
Due to bug https://github.com/peerlibrary/meteor-blaze-components/issues/50
Diffstat (limited to 'client/components')
-rw-r--r--client/components/boards/boardBody.jade2
-rw-r--r--client/components/cards/helpers.js2
-rw-r--r--client/components/lists/body.jade1
-rw-r--r--client/components/lists/header.jade6
4 files changed, 5 insertions, 6 deletions
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade
index 57970c4f..c3043327 100644
--- a/client/components/boards/boardBody.jade
+++ b/client/components/boards/boardBody.jade
@@ -27,7 +27,7 @@ template(name="addListForm")
.list.js-list.list-composer.js-list-composer
+inlinedForm(autoclose=false)
input.list-name-input(type="text" placeholder="{{_ 'add-list'}}"
- autocomplete="off" autofocus value=getCache)
+ autocomplete="off" autofocus)
div.edit-controls.clearfix
button.primary.confirm.js-save-edit(type="submit") {{_ 'save'}}
a.fa.fa-times-thin.js-close-inlined-form
diff --git a/client/components/cards/helpers.js b/client/components/cards/helpers.js
index 708b1b56..ce85002d 100644
--- a/client/components/cards/helpers.js
+++ b/client/components/cards/helpers.js
@@ -28,7 +28,7 @@ Template.createLabelPopup.helpers({
var labels = this.labels || this.card.board().labels;
var usedColors = _.pluck(labels, 'color');
var availableColors = _.difference(labelColors, usedColors);
- return availableColors.length > 1 ? availableColors[0] : 'green';
+ return availableColors.length > 1 ? availableColors[0] : labelColors[0];
}
});
diff --git a/client/components/lists/body.jade b/client/components/lists/body.jade
index 3e780850..9f9d04ad 100644
--- a/client/components/lists/body.jade
+++ b/client/components/lists/body.jade
@@ -19,7 +19,6 @@ template(name="addCardForm")
.minicard-labels.js-minicard-composer-labels
.minicard-details.clearfix
textarea.minicard-composer-textarea.js-card-title(autofocus)
- = getCache
.minicard-members.js-minicard-composer-members
.add-controls.clearfix
button.primary.confirm(type="submit") {{_ 'add'}}
diff --git a/client/components/lists/header.jade b/client/components/lists/header.jade
index 5196af5d..b8548278 100644
--- a/client/components/lists/header.jade
+++ b/client/components/lists/header.jade
@@ -7,7 +7,7 @@ template(name="listHeader")
a.list-header-menu-icon.fa.fa-bars.js-open-list-menu
template(name="editListTitleForm")
- input.field.single-line(type="text" value="{{getCache title}}" autofocus)
+ input.field.single-line(type="text" value=title autofocus)
.edit-controls.clearfix
- input.primary.confirm(type="submit" value="{{_ 'save'}}")
- a.fa.fa-times.js-close-inlined-form
+ button.primary.confirm(type="submit") {{_ 'save'}}
+ a.fa.fa-times-thin.js-close-inlined-form