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

FIX: disabled combo-box attribute had no effect

This commit is contained in:
Neil Lalonde 2016-06-17 13:40:32 -04:00
parent a4a53d6500
commit 612e084595
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ import { on, observes } from 'ember-addons/ember-computed-decorators';
export default Ember.Component.extend({ export default Ember.Component.extend({
tagName: 'select', tagName: 'select',
attributeBindings: ['tabindex'], attributeBindings: ['tabindex', 'disabled'],
classNames: ['combobox'], classNames: ['combobox'],
valueAttribute: 'id', valueAttribute: 'id',
nameProperty: 'name', nameProperty: 'name',

3
app/assets/stylesheets/common/base/combobox.scss
View File

@ -39,6 +39,9 @@
&.select2-container-active { &.select2-container-active {
border-color: $tertiary; border-color: $tertiary;
} }
&.select2-container-disabled .select2-chosen {
color: blend-primary-secondary(50%);
}
} }
.select2-container-multi .select2-choices { .select2-container-multi .select2-choices {