Browse Source

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

# Conflicts:
#	dist/bundle.js
#	dist/fineui.js
#	dist/widget.js
es6
windy 6 years ago
parent
commit
b6e47d37f6
  1. 2
      dist/_fineui.min.js
  2. 73428
      dist/base.js
  3. 2
      dist/bundle.min.js
  4. 2
      dist/fineui.min.js
  5. 2
      src/base/combination/tree.button.js

2
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

73428
dist/base.js vendored

File diff suppressed because it is too large Load Diff

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
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()) {

Loading…
Cancel
Save