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

bi/base.js

@@ -18465,7 +18465,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
     setStyle: function (style) {
         this.style = style;
         this.element.css(style);
-        this.content.element.css(style)
+        this.content.element.css(BI.extend({}, style, {
+            color: style.color || BI.DOM.getContrastColor(BI.DOM.isRGBColor(style.backgroundColor) ? BI.DOM.rgb2hex(style.backgroundColor) : style.backgroundColor)
+        }))
     },
 
     getStyle: function () {

bi/core.js

@@ -17474,7 +17474,7 @@ Data.Constant = BI.Constant = BICst = {};
             var args = Array.prototype.slice.call(arguments, 0),
                 copy = _Shared;
             for (var i = 0; i < args.length; i++) {
-                copy = copy[args[i]];
+                copy = copy && copy[args[i]];
             }
             return copy;
         },

dist/base.js

@@ -18465,7 +18465,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
     setStyle: function (style) {
         this.style = style;
         this.element.css(style);
-        this.content.element.css(style)
+        this.content.element.css(BI.extend({}, style, {
+            color: style.color || BI.DOM.getContrastColor(BI.DOM.isRGBColor(style.backgroundColor) ? BI.DOM.rgb2hex(style.backgroundColor) : style.backgroundColor)
+        }))
     },
 
     getStyle: function () {

dist/bundle.js

@@ -28616,7 +28616,7 @@ Data.Constant = BI.Constant = BICst = {};
             var args = Array.prototype.slice.call(arguments, 0),
                 copy = _Shared;
             for (var i = 0; i < args.length; i++) {
-                copy = copy[args[i]];
+                copy = copy && copy[args[i]];
             }
             return copy;
         },
@@ -47194,7 +47194,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
     setStyle: function (style) {
         this.style = style;
         this.element.css(style);
-        this.content.element.css(style)
+        this.content.element.css(BI.extend({}, style, {
+            color: style.color || BI.DOM.getContrastColor(BI.DOM.isRGBColor(style.backgroundColor) ? BI.DOM.rgb2hex(style.backgroundColor) : style.backgroundColor)
+        }))
     },
 
     getStyle: function () {

dist/core.js

@@ -28616,7 +28616,7 @@ Data.Constant = BI.Constant = BICst = {};
             var args = Array.prototype.slice.call(arguments, 0),
                 copy = _Shared;
             for (var i = 0; i < args.length; i++) {
-                copy = copy[args[i]];
+                copy = copy && copy[args[i]];
             }
             return copy;
         },

src/base/single/editor/editor.textarea.js

@@ -142,7 +142,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
     setStyle: function (style) {
         this.style = style;
         this.element.css(style);
-        this.content.element.css(style)
+        this.content.element.css(BI.extend({}, style, {
+            color: style.color || BI.DOM.getContrastColor(BI.DOM.isRGBColor(style.backgroundColor) ? BI.DOM.rgb2hex(style.backgroundColor) : style.backgroundColor)
+        }))
     },
 
     getStyle: function () {

src/data/pool/pool.sharing.js

@@ -15,7 +15,7 @@
             var args = Array.prototype.slice.call(arguments, 0),
                 copy = _Shared;
             for (var i = 0; i < args.length; i++) {
-                copy = copy[args[i]];
+                copy = copy && copy[args[i]];
             }
             return copy;
         },