diff --git a/src/case/list/list.select.js b/src/case/list/list.select.js index 861e111de4..9d5f47ddec 100644 --- a/src/case/list/list.select.js +++ b/src/case/list/list.select.js @@ -52,7 +52,7 @@ BI.SelectList = BI.inherit(BI.Widget, { callback.apply(self, arguments); if (op.times === 1) { self.toolbar.setVisible(items && items.length > 0); - self.toolbar.setEnable(items && items.length > 0); + self.toolbar.setEnable(!o.disabled && items && items.length > 0); } self._checkAllSelected(); }); @@ -151,7 +151,7 @@ BI.SelectList = BI.inherit(BI.Widget, { value: this.list.getNotSelectedValue(), assist: this.list.getValue() }; - + }, empty: function () { @@ -159,8 +159,9 @@ BI.SelectList = BI.inherit(BI.Widget, { }, populate: function (items) { + var o = this.options; this.toolbar.setVisible(!BI.isEmptyArray(items)); - this.toolbar.setEnable(!BI.isEmptyArray(items)); + this.toolbar.setEnable(!o.disabled && !BI.isEmptyArray(items)); this.list.populate.apply(this.list, arguments); this._checkAllSelected(); }, diff --git a/src/widget/multiselect/multiselect.loader.js b/src/widget/multiselect/multiselect.loader.js index 4f9e0fd973..456562995a 100644 --- a/src/widget/multiselect/multiselect.loader.js +++ b/src/widget/multiselect/multiselect.loader.js @@ -127,6 +127,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { cls: "bi-list-item-active", height: 24, selected: this.isAllSelected(), + disabled: this.options.disabled, iconWrapperWidth: 36 }); }, @@ -172,12 +173,6 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { } }, - _setEnable: function (enable) { - BI.MultiSelectLoader.superclass._setEnable.apply(this, arguments); - this._assertMasker(); - this.masker.setVisible(!enable); - }, - setStartValue: function (v) { this._startValue = v; },