fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #781 in VISUAL/fineui from ~DAILER/fineui:master to master 

* commit '2175b45aef6a45d1c7b042c83f3546479203ecbf':
  无jira任务,路径覆盖不全,如果populate方法没传参内部button_group不应当populate
  update
  无jira任务,旧的执行顺序实际是    providerInstance[type] = (new providers[type].$get())(config);   加()约束一下
es6
Dailer 6 years ago
parent
3facae2a1b 2175b45aef
commit
73a72fffdd
15 changed files with 74 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      dist/base.js
  2. 11
      dist/bundle.ie.js
  3. 18
      dist/bundle.ie.min.js
  4. 11
      dist/bundle.js
  5. 18
      dist/bundle.min.js
  6. 2
      dist/core.js
  7. 11
      dist/fineui.ie.js
  8. 18
      dist/fineui.ie.min.js
  9. 11
      dist/fineui.js
  10. 18
      dist/fineui.min.js
  11. 11
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.js
  13. 4
      dist/utils.min.js
  14. 9
      src/base/combination/loader.js
  15. 2
      src/core/inject.js

9
dist/base.js vendored
Unescape View File

@ -4132,11 +4132,10 @@ BI.Loader = BI.inherit(BI.Widget, {
if (arguments.length === 0) { if (arguments.length === 0) {
throw new Error("arguments can not be null!!!"); throw new Error("arguments can not be null!!!");
} }
self._populate.apply(self, arguments); self.populate.apply(self, arguments);
self.button_group.populate.apply(self.button_group, arguments);
o.onLoaded(); o.onLoaded();
}]); }]);
return; return false;
} }
this.options.items = items; this.options.items = items;
this.times = 1; this.times = 1;
@ -4156,11 +4155,11 @@ BI.Loader = BI.inherit(BI.Widget, {
this.prev.invisible(); this.prev.invisible();
} }
} }
return true;
}, },
populate: function () { populate: function () {
this._populate.apply(this, arguments); this._populate.apply(this, arguments) && this.button_group.populate.apply(this.button_group, arguments);
this.button_group.populate.apply(this.button_group, arguments);
}, },
setNotSelectedValue: function () { setNotSelectedValue: function () {

11
dist/bundle.ie.js vendored
Unescape View File

@ -18631,7 +18631,7 @@ _.extend(BI, {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }
@ -39218,11 +39218,10 @@ BI.Loader = BI.inherit(BI.Widget, {
if (arguments.length === 0) { if (arguments.length === 0) {
throw new Error("arguments can not be null!!!"); throw new Error("arguments can not be null!!!");
} }
self._populate.apply(self, arguments); self.populate.apply(self, arguments);
self.button_group.populate.apply(self.button_group, arguments);
o.onLoaded(); o.onLoaded();
}]); }]);
return; return false;
} }
this.options.items = items; this.options.items = items;
this.times = 1; this.times = 1;
@ -39242,11 +39241,11 @@ BI.Loader = BI.inherit(BI.Widget, {
this.prev.invisible(); this.prev.invisible();
} }
} }
return true;
}, },
populate: function () { populate: function () {
this._populate.apply(this, arguments); this._populate.apply(this, arguments) && this.button_group.populate.apply(this.button_group, arguments);
this.button_group.populate.apply(this.button_group, arguments);
}, },
setNotSelectedValue: function () { setNotSelectedValue: function () {

18
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/bundle.js vendored
Unescape View File

@ -18631,7 +18631,7 @@ _.extend(BI, {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }
@ -39622,11 +39622,10 @@ BI.Loader = BI.inherit(BI.Widget, {
if (arguments.length === 0) { if (arguments.length === 0) {
throw new Error("arguments can not be null!!!"); throw new Error("arguments can not be null!!!");
} }
self._populate.apply(self, arguments); self.populate.apply(self, arguments);
self.button_group.populate.apply(self.button_group, arguments);
o.onLoaded(); o.onLoaded();
}]); }]);
return; return false;
} }
this.options.items = items; this.options.items = items;
this.times = 1; this.times = 1;
@ -39646,11 +39645,11 @@ BI.Loader = BI.inherit(BI.Widget, {
this.prev.invisible(); this.prev.invisible();
} }
} }
return true;
}, },
populate: function () { populate: function () {
this._populate.apply(this, arguments); this._populate.apply(this, arguments) && this.button_group.populate.apply(this.button_group, arguments);
this.button_group.populate.apply(this.button_group, arguments);
}, },
setNotSelectedValue: function () { setNotSelectedValue: function () {

18
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/core.js vendored
Unescape View File

@ -18631,7 +18631,7 @@ _.extend(BI, {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }

11
dist/fineui.ie.js vendored
Unescape View File

@ -18873,7 +18873,7 @@ _.extend(BI, {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }
@ -39460,11 +39460,10 @@ BI.Loader = BI.inherit(BI.Widget, {
if (arguments.length === 0) { if (arguments.length === 0) {
throw new Error("arguments can not be null!!!"); throw new Error("arguments can not be null!!!");
} }
self._populate.apply(self, arguments); self.populate.apply(self, arguments);
self.button_group.populate.apply(self.button_group, arguments);
o.onLoaded(); o.onLoaded();
}]); }]);
return; return false;
} }
this.options.items = items; this.options.items = items;
this.times = 1; this.times = 1;
@ -39484,11 +39483,11 @@ BI.Loader = BI.inherit(BI.Widget, {
this.prev.invisible(); this.prev.invisible();
} }
} }
return true;
}, },
populate: function () { populate: function () {
this._populate.apply(this, arguments); this._populate.apply(this, arguments) && this.button_group.populate.apply(this.button_group, arguments);
this.button_group.populate.apply(this.button_group, arguments);
}, },
setNotSelectedValue: function () { setNotSelectedValue: function () {

18
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/fineui.js vendored
Unescape View File

@ -18873,7 +18873,7 @@ _.extend(BI, {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }
@ -39864,11 +39864,10 @@ BI.Loader = BI.inherit(BI.Widget, {
if (arguments.length === 0) { if (arguments.length === 0) {
throw new Error("arguments can not be null!!!"); throw new Error("arguments can not be null!!!");
} }
self._populate.apply(self, arguments); self.populate.apply(self, arguments);
self.button_group.populate.apply(self.button_group, arguments);
o.onLoaded(); o.onLoaded();
}]); }]);
return; return false;
} }
this.options.items = items; this.options.items = items;
this.times = 1; this.times = 1;
@ -39888,11 +39887,11 @@ BI.Loader = BI.inherit(BI.Widget, {
this.prev.invisible(); this.prev.invisible();
} }
} }
return true;
}, },
populate: function () { populate: function () {
this._populate.apply(this, arguments); this._populate.apply(this, arguments) && this.button_group.populate.apply(this.button_group, arguments);
this.button_group.populate.apply(this.button_group, arguments);
}, },
setNotSelectedValue: function () { setNotSelectedValue: function () {

18
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -18377,7 +18377,7 @@ _.extend(BI, {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }
@ -27473,11 +27473,10 @@ BI.Loader = BI.inherit(BI.Widget, {
if (arguments.length === 0) { if (arguments.length === 0) {
throw new Error("arguments can not be null!!!"); throw new Error("arguments can not be null!!!");
} }
self._populate.apply(self, arguments); self.populate.apply(self, arguments);
self.button_group.populate.apply(self.button_group, arguments);
o.onLoaded(); o.onLoaded();
}]); }]);
return; return false;
} }
this.options.items = items; this.options.items = items;
this.times = 1; this.times = 1;
@ -27497,11 +27496,11 @@ BI.Loader = BI.inherit(BI.Widget, {
this.prev.invisible(); this.prev.invisible();
} }
} }
return true;
}, },
populate: function () { populate: function () {
this._populate.apply(this, arguments); this._populate.apply(this, arguments) && this.button_group.populate.apply(this.button_group, arguments);
this.button_group.populate.apply(this.button_group, arguments);
}, },
setNotSelectedValue: function () { setNotSelectedValue: function () {

2
dist/utils.js vendored
Unescape View File

@ -13585,7 +13585,7 @@ if (!_global.BI) {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }

4
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
src/base/combination/loader.js
Unescape View File

@ -170,11 +170,10 @@ BI.Loader = BI.inherit(BI.Widget, {
if (arguments.length === 0) { if (arguments.length === 0) {
throw new Error("arguments can not be null!!!"); throw new Error("arguments can not be null!!!");
} }
self._populate.apply(self, arguments); self.populate.apply(self, arguments);
self.button_group.populate.apply(self.button_group, arguments);
o.onLoaded(); o.onLoaded();
}]); }]);
return; return false;
} }
this.options.items = items; this.options.items = items;
this.times = 1; this.times = 1;
@ -194,11 +193,11 @@ BI.Loader = BI.inherit(BI.Widget, {
this.prev.invisible(); this.prev.invisible();
} }
} }
return true;
}, },
populate: function () { populate: function () {
this._populate.apply(this, arguments); this._populate.apply(this, arguments) && this.button_group.populate.apply(this.button_group, arguments);
this.button_group.populate.apply(this.button_group, arguments);
}, },
setNotSelectedValue: function () { setNotSelectedValue: function () {

2
src/core/inject.js
Unescape View File

@ -195,7 +195,7 @@
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }

Write Preview
Loading…
Cancel
Save