Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: more resilient allowInitiatlValueMutation implementation

This commit is contained in:
Joffrey JAFFEUX 2017-11-23 14:39:26 +01:00 committed by GitHub
parent 961a09ff14
commit fe94e7c453
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
View File

@ -1,6 +1,6 @@
<form> <form>
<div class="control-group"> <div class="control-group">
{{combo-box content=timerTypes value=selection width="50%"}} {{combo-box allowInitialValueMutation=true content=timerTypes value=selection}}
</div> </div>
<div> <div>

19
app/assets/javascripts/select-kit/components/single-select.js.es6
View File

@ -13,21 +13,6 @@ export default SelectKitComponent.extend({
value: null, value: null,
allowInitialValueMutation: true, allowInitialValueMutation: true,
init() {
this._super();
if (this.get("allowInitialValueMutation") === true) {
const none = isNone(this.get("none"));
const emptyValue = isEmpty(this.get("value"));
if (none && emptyValue) {
if (!isEmpty(this.get("content"))) {
const value = this.valueForContentItem(this.get("content.firstObject"));
Ember.run.next(() => this.mutateValue(value));
}
}
}
},
@on("didReceiveAttrs") @on("didReceiveAttrs")
_compute() { _compute() {
Ember.run.scheduleOnce("afterRender", () => { Ember.run.scheduleOnce("afterRender", () => {
@ -43,6 +28,8 @@ export default SelectKitComponent.extend({
this.didComputeValue(value); this.didComputeValue(value);
this.set("headerComputedContent", this.computeHeaderContent()); this.set("headerComputedContent", this.computeHeaderContent());
this.didComputeAttributes(); this.didComputeAttributes();
if (this.get("allowInitialValueMutation")) this.mutateAttributes();
}); });
}, },
@ -71,7 +58,7 @@ export default SelectKitComponent.extend({
willComputeValue(value) { return value; }, willComputeValue(value) { return value; },
computeValue(value) { return value; }, computeValue(value) { return value; },
_beforeDidComputeValue(value) { _beforeDidComputeValue(value) {
if (!isEmpty(this.get("content")) && isNone(value) && isNone(this.get("none"))) { if (!isEmpty(this.get("content")) && isEmpty(value) && isNone(this.get("none"))) {
value = this.valueForContentItem(get(this.get("content"), "firstObject")); value = this.valueForContentItem(get(this.get("content"), "firstObject"));
} }