Browse Source

Pull request #1820: BI-82726 默认trigger的populate行为为空

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '791e952ae7bb649de9152dfdc8c1f996ca11628b':
  expander && switcher
  更改widget reset方法
  无JIRA任务 默认trigger的populate行为为空
master
windy 4 years ago
parent
commit
2be462509d
  1. 2
      src/base/combination/combo.js
  2. 2
      src/base/combination/expander.js
  3. 2
      src/base/combination/switcher.js
  4. 2
      src/base/single/trigger/trigger.js
  5. 2
      src/core/widget.js

2
src/base/combination/combo.js

@ -515,7 +515,7 @@
populate: function (items) { populate: function (items) {
this._assertPopupView(); this._assertPopupView();
this.popupView.populate.apply(this.popupView, arguments); this.popupView.populate.apply(this.popupView, arguments);
this.combo.populate.apply(this.combo, arguments); this.combo.populate && this.combo.populate.apply(this.combo, arguments);
}, },
_setEnable: function (arg) { _setEnable: function (arg) {

2
src/base/combination/expander.js

@ -197,7 +197,7 @@ BI.Expander = BI.inherit(BI.Widget, {
populate: function (items) { populate: function (items) {
// this._assertPopupView(); // this._assertPopupView();
this.popupView && this.popupView.populate.apply(this.popupView, arguments); this.popupView && this.popupView.populate.apply(this.popupView, arguments);
this.expander.populate.apply(this.expander, arguments); this.expander.populate && this.expander.populate.apply(this.expander, arguments);
}, },
_setEnable: function (arg) { _setEnable: function (arg) {

2
src/base/combination/switcher.js

@ -194,7 +194,7 @@ BI.Switcher = BI.inherit(BI.Widget, {
populate: function (items) { populate: function (items) {
this._assertPopupView(); this._assertPopupView();
this.popupView.populate.apply(this.popupView, arguments); this.popupView.populate.apply(this.popupView, arguments);
this.switcher.populate.apply(this.switcher, arguments); this.switcher.populate && this.switcher.populate.apply(this.switcher, arguments);
}, },
_setEnable: function (arg) { _setEnable: function (arg) {

2
src/base/single/trigger/trigger.js

@ -23,5 +23,5 @@ BI.Trigger = BI.inherit(BI.Single, {
getKey: function () { getKey: function () {
} },
}); });

2
src/core/widget.js

@ -565,7 +565,7 @@
}, },
// 默认的populate方法就是干掉重来 // 默认的populate方法就是干掉重来
populate: function () { reset: function () {
this.purgeListeners(); this.purgeListeners();
this.empty(); this.empty();
this._initCurrent(); this._initCurrent();

Loading…
Cancel
Save