github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-31 00:35:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: makes sure we recompute shouldDisplayCreateRow after request

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2018-03-03 11:42:44 +01:00 committed by GitHub
parent 6d359ca823
commit 5e323139ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
return this.computeContentItem(contentItem, options);
},
@computed("isAsync", "filteredAsyncComputedContent", "filteredComputedContent")
@computed("isAsync", "filteredAsyncComputedContent.[]", "filteredComputedContent.[]")
collectionComputedContent(isAsync, filteredAsyncComputedContent, filteredComputedContent) {
return isAsync ? filteredAsyncComputedContent : filteredComputedContent;
},
@ -201,10 +201,10 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
return false;
},
@computed("filter", "computedContent", "limitReached")
shouldDisplayCreateRow(filter, computedContent, limitReached) {
@computed("computedValue", "filter", "collectionComputedContent.[]", "limitReached")
shouldDisplayCreateRow(computedValue, filter, collectionComputedContent, limitReached) {
if (limitReached) return false;
if (computedContent.map(c => c.value).includes(filter)) return false;
if (collectionComputedContent.map(c => c.value).includes(filter)) return false;
if (this.get("allowAny") && filter.length > 0 && this.validateCreate(filter)) return true;
return false;
},

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

@ -130,8 +130,8 @@ export default SelectKitComponent.extend({
!Ember.isNone(selectedComputedContent);
},
@computed("filter", "computedValue")
shouldDisplayCreateRow(filter, computedValue) {
@computed("computedValue", "filter", "collectionComputedContent.[]", "limitReached")
shouldDisplayCreateRow(computedValue, filter) {
return this._super() && computedValue !== filter;
},