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
8 years ago · fc939da9d8
3 changed files with 3 additions and 3 deletions
--- a/bi/core.js
+++ b/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");
--- a/dist/core.js
+++ b/dist/core.js
@ -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");
--- a/src/core/widget.js
+++ b/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");