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

Merge pull request #3582 from riking/patch-3 

FIX: combo-box should observe on nameProperty
This commit is contained in:
Robin Ward 2015-07-01 14:42:36 -04:00
parent 05b611853c 5022507029
commit 29c4b9520c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/components/combo-box.js.es6
View File

@ -14,8 +14,12 @@ export default Ember.Component.extend({
return result; return result;
}, },
realNameProperty: function() {
return this.get('nameProperty') || 'name';
}.property('nameProperty'),
render(buffer) { render(buffer) {
const nameProperty = this.get('nameProperty') || 'name', const nameProperty = this.get('realNameProperty'),
none = this.get('none'); none = this.get('none');
// Add none option if required // Add none option if required
@ -64,6 +68,11 @@ export default Ember.Component.extend({
o.selected = !!$(o).attr('selected'); o.selected = !!$(o).attr('selected');
}); });
// observer for item names changing (optional)
if (this.get('nameChanges')) {
this.addObserver('content.@each.' + this.get('realNameProperty'), this.rerender);
}
$elem.select2({formatResult: this.comboTemplate, minimumResultsForSearch: 5, width: 'resolve'}); $elem.select2({formatResult: this.comboTemplate, minimumResultsForSearch: 5, width: 'resolve'});
const castInteger = this.get('castInteger'); const castInteger = this.get('castInteger');