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);   加()约束一下

dist/base.js

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

dist/bundle.ie.js

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

dist/bundle.js

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

dist/core.js

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

dist/fineui.ie.js

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

dist/fineui.js

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

dist/fineui_without_jquery_polyfill.js

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

dist/utils.js

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

src/base/combination/loader.js

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

src/core/inject.js

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