Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui

# Conflicts: # dist/bundle.js # dist/fineui.js # dist/widget.js
6 years ago · b6e47d37f6
5 changed files with 36718 additions and 36718 deletions
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/base.js
+++ b/dist/base.js
@ -1498,7 +1498,7 @@ BI.ButtonTree = BI.inherit(BI.ButtonGroup, {
        var v = [];
        BI.each(this.buttons, function (i, item) {
            if (item.isEnabled() && !BI.isFunction(item.setSelected)) {
-                v = BI.union(v, item.getValue());
+                v = BI.concat(v, item.getValue());
                return;
            }
            if (item.isEnabled() && item.isSelected && item.isSelected()) {
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/src/base/combination/tree.button.js
+++ b/src/base/combination/tree.button.js
@ -78,7 +78,7 @@ BI.ButtonTree = BI.inherit(BI.ButtonGroup, {
        var v = [];
        BI.each(this.buttons, function (i, item) {
            if (item.isEnabled() && !BI.isFunction(item.setSelected)) {
-                v = BI.union(v, item.getValue());
+                v = BI.concat(v, item.getValue());
                return;
            }
            if (item.isEnabled() && item.isSelected && item.isSelected()) {