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

# Conflicts:
#	dist/_fineui.min.js
#	dist/bundle.min.js
#	dist/fineui.min.js

dist/base.js

@@ -18175,7 +18175,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
             items: [{
                 el: this.watermark,
                 top: 0,
-                left: o.lineNumbers ? 5 : 30 + 5
+                left: o.lineNumbers ? 30 + 5 : 5
             }]
         });
     },
@@ -18185,6 +18185,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
         if (BI.isNumber(o.value) || BI.isString(o.value)) {
             this.setValue(o.value);
         }
+
+        if (BI.isNotNull(o.style)) {
+            self.setStyle(o.style);
+        }
     },
 
     _setEnable: function (b) {
@@ -18770,7 +18774,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
             self.setValue(o.value);
         }
         if (BI.isNotNull(o.style)) {
-            self.setValue(o.style);
+            self.setStyle(o.style);
         }
         this._checkWaterMark();
     },

dist/bundle.js

@@ -53923,7 +53923,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
             items: [{
                 el: this.watermark,
                 top: 0,
-                left: o.lineNumbers ? 5 : 30 + 5
+                left: o.lineNumbers ? 30 + 5 : 5
             }]
         });
     },
@@ -53933,6 +53933,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
         if (BI.isNumber(o.value) || BI.isString(o.value)) {
             this.setValue(o.value);
         }
+
+        if (BI.isNotNull(o.style)) {
+            self.setStyle(o.style);
+        }
     },
 
     _setEnable: function (b) {
@@ -54518,7 +54522,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
             self.setValue(o.value);
         }
         if (BI.isNotNull(o.style)) {
-            self.setValue(o.style);
+            self.setStyle(o.style);
         }
         this._checkWaterMark();
     },
@@ -111587,7 +111591,7 @@ BI.shortcut("bi.value_chooser_pane", BI.ValueChooserPane);;(function () {
                 needPop = true;
             }
             this.store = this._store();
-            this.store && (this.store._widget = this);
+            this.store && this.store._widget = this;
             needPop && popTarget();
             needPop = false;
             pushTarget(this.store);

dist/fix/fix.compact.js

@@ -115,7 +115,7 @@
                 needPop = true;
             }
             this.store = this._store();
-            this.store && (this.store._widget = this);
+            this.store && this.store._widget = this;
             needPop && popTarget();
             needPop = false;
             pushTarget(this.store);

src/base/single/editor/editor.code.js

@@ -84,7 +84,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
             items: [{
                 el: this.watermark,
                 top: 0,
-                left: o.lineNumbers ? 5 : 30 + 5
+                left: o.lineNumbers ? 30 + 5 : 5
             }]
         });
     },
@@ -94,6 +94,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
         if (BI.isNumber(o.value) || BI.isString(o.value)) {
             this.setValue(o.value);
         }
+
+        if (BI.isNotNull(o.style)) {
+            self.setStyle(o.style);
+        }
     },
 
     _setEnable: function (b) {

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

@@ -65,7 +65,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
             self.setValue(o.value);
         }
         if (BI.isNotNull(o.style)) {
-            self.setValue(o.style);
+            self.setStyle(o.style);
         }
         this._checkWaterMark();
     },