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

FIX: don’t convert an object using EachProxy to an array

This commit is contained in:
Joffrey JAFFEUX 2017-11-22 14:33:04 +01:00 committed by GitHub
parent b14d9529b8
commit acdfb3ed03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/select-kit/components/multi-select.js.es6
View File

@ -38,8 +38,7 @@ export default SelectKitComponent.extend({
_compute() {
Ember.run.scheduleOnce("afterRender", () => {
this.willComputeAttributes();
let content = this._beforeWillComputeContent(this.get("content"));
content = this.willComputeContent(content);
let content = this.willComputeContent(this.get("content") || []);
let values = this._beforeWillComputeValues(this.get("values"));
content = this.computeContent(content);
content = this._beforeDidComputeContent(content);

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

@ -1,4 +1,4 @@
const { isNone, makeArray } = Ember;
const { isNone } = Ember;
import computed from "ember-addons/ember-computed-decorators";
import UtilsMixin from "select-kit/mixins/utils";
import DomHelpersMixin from "select-kit/mixins/dom-helpers";
@ -88,7 +88,6 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
willComputeAttributes() {},
didComputeAttributes() {},
_beforeWillComputeContent(content) { return makeArray(content); },
willComputeContent(content) { return content; },
computeContent(content) { return content; },
_beforeDidComputeContent(content) {

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

@ -32,8 +32,7 @@ export default SelectKitComponent.extend({
_compute() {
Ember.run.scheduleOnce("afterRender", () => {
this.willComputeAttributes();
let content = this._beforeWillComputeContent(this.get("content"));
content = this.willComputeContent(content);
let content = this.willComputeContent(this.get("content") || []);
let value = this._beforeWillComputeValue(this.get("value"));
content = this.computeContent(content);
content = this._beforeDidComputeContent(content);