Browse Source

Merge branch '2.0' of http://www.finedevelop.com:2015/scm/~guy/fineui into 2.0

# Conflicts:
#	bi/core.js
#	dist/core.js
#	src/core/widget.js
es6
guy 8 years ago
parent
commit
fc939da9d8
  1. 2
      bi/core.js
  2. 2
      dist/core.js
  3. 2
      src/core/widget.js

2
bi/core.js

@ -4673,7 +4673,7 @@ BI.Widget = BI.inherit(BI.OB, {
widget = name;
name = widget.getName();
}
if (BI.isKey(name)) {
if(BI.isKey(name)){
name = name + "";
}
name = name || widget.getName() || BI.uniqueId("widget");

2
dist/core.js vendored

@ -14585,7 +14585,7 @@ BI.Widget = BI.inherit(BI.OB, {
widget = name;
name = widget.getName();
}
if (BI.isKey(name)) {
if(BI.isKey(name)){
name = name + "";
}
name = name || widget.getName() || BI.uniqueId("widget");

2
src/core/widget.js

@ -249,7 +249,7 @@ BI.Widget = BI.inherit(BI.OB, {
widget = name;
name = widget.getName();
}
if (BI.isKey(name)) {
if(BI.isKey(name)){
name = name + "";
}
name = name || widget.getName() || BI.uniqueId("widget");

Loading…
Cancel
Save