Merge pull request #481 in VISUAL/fineui from ~FAY/fineui:master to master

* commit '785da20a7d2478ce9591ab8d0344079614d125cc':
  update

dist/bundle.js

@@ -83019,8 +83019,8 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
         var attrs = BI.DOM.getImage(o.paramFormatter(param));
         image.src = attrs.src;
         image.alt = param;
-        image.style = attrs.style;
         $(image).addClass("rich-editor-param");
+        $(image).attr("style", attrs.style);
         this.options.editor.insertHTML($("<div>").append(image).html());
         // var sel = this._get$Sel();
         // var wrapper = o.editor.instance.getElm().element;
@@ -83160,7 +83160,7 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
                 {type: "bi.rich_editor_align_right_button"},
                 {type: "bi.rich_editor_param_button"}
             ],
-            height: 28
+            height: 34
         });
     },
 
@@ -83182,7 +83182,7 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
             element: this,
             items: buttons,
             hgap: 3,
-            vgap: 3
+            vgap: 6
         });
     },
 
@@ -83527,7 +83527,11 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
 
             try {
                 // w3c
-                this.nicCommand("insertHTML", html);
+                if (document.queryCommandState("insertHTML")) {
+                    this.nicCommand("insertHTML", html);
+                } else {
+                    throw new Error("Does not support this command");
+                }
             } catch(e) {
                 if (range.insertNode) {
                     // IE
@@ -84182,6 +84186,14 @@ BI.RichEditor = BI.inherit(BI.Widget, {
         readOnly: false
     },
 
+    _defaultConfig: function () {
+        return BI.extend(BI.RichEditor.superclass._defaultConfig.apply(this, arguments), {
+            adjustLength: 1,
+            adjustXOffset: 0,
+            adjustYOffset: 0
+        });
+    },
+
     render: function () {
         var self = this, o = this.options;
         var editor = {
@@ -84218,7 +84230,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             direction: "top,right",
             isNeedAdjustWidth: false,
             isNeedAdjustHeight: false,
-            adjustLength: 1,
+            adjustLength: o.adjustLength,
+            adjustXOffset: o.adjustXOffset,
+            adjustYOffset: o.adjustYOffset,
             ref: function () {
                 self.combo = this;
             },
@@ -84228,7 +84242,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
                     type: "bi.rich_editor_text_toolbar",
                     editor: this.editor
                 }, o.toolbar),
-                height: 30,
+                height: 34,
                 stopPropagation: true,
                 stopEvent: true
             },

dist/case.js

@@ -10519,8 +10519,8 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
         var attrs = BI.DOM.getImage(o.paramFormatter(param));
         image.src = attrs.src;
         image.alt = param;
-        image.style = attrs.style;
         $(image).addClass("rich-editor-param");
+        $(image).attr("style", attrs.style);
         this.options.editor.insertHTML($("<div>").append(image).html());
         // var sel = this._get$Sel();
         // var wrapper = o.editor.instance.getElm().element;
@@ -10660,7 +10660,7 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
                 {type: "bi.rich_editor_align_right_button"},
                 {type: "bi.rich_editor_param_button"}
             ],
-            height: 28
+            height: 34
         });
     },
 
@@ -10682,7 +10682,7 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
             element: this,
             items: buttons,
             hgap: 3,
-            vgap: 3
+            vgap: 6
         });
     },
 
@@ -11027,7 +11027,11 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
 
             try {
                 // w3c
-                this.nicCommand("insertHTML", html);
+                if (document.queryCommandState("insertHTML")) {
+                    this.nicCommand("insertHTML", html);
+                } else {
+                    throw new Error("Does not support this command");
+                }
             } catch(e) {
                 if (range.insertNode) {
                     // IE
@@ -11682,6 +11686,14 @@ BI.RichEditor = BI.inherit(BI.Widget, {
         readOnly: false
     },
 
+    _defaultConfig: function () {
+        return BI.extend(BI.RichEditor.superclass._defaultConfig.apply(this, arguments), {
+            adjustLength: 1,
+            adjustXOffset: 0,
+            adjustYOffset: 0
+        });
+    },
+
     render: function () {
         var self = this, o = this.options;
         var editor = {
@@ -11718,7 +11730,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             direction: "top,right",
             isNeedAdjustWidth: false,
             isNeedAdjustHeight: false,
-            adjustLength: 1,
+            adjustLength: o.adjustLength,
+            adjustXOffset: o.adjustXOffset,
+            adjustYOffset: o.adjustYOffset,
             ref: function () {
                 self.combo = this;
             },
@@ -11728,7 +11742,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
                     type: "bi.rich_editor_text_toolbar",
                     editor: this.editor
                 }, o.toolbar),
-                height: 30,
+                height: 34,
                 stopPropagation: true,
                 stopEvent: true
             },

dist/fineui.js

@@ -83268,8 +83268,8 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
         var attrs = BI.DOM.getImage(o.paramFormatter(param));
         image.src = attrs.src;
         image.alt = param;
-        image.style = attrs.style;
         $(image).addClass("rich-editor-param");
+        $(image).attr("style", attrs.style);
         this.options.editor.insertHTML($("<div>").append(image).html());
         // var sel = this._get$Sel();
         // var wrapper = o.editor.instance.getElm().element;
@@ -83409,7 +83409,7 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
                 {type: "bi.rich_editor_align_right_button"},
                 {type: "bi.rich_editor_param_button"}
             ],
-            height: 28
+            height: 34
         });
     },
 
@@ -83431,7 +83431,7 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
             element: this,
             items: buttons,
             hgap: 3,
-            vgap: 3
+            vgap: 6
         });
     },
 
@@ -83776,7 +83776,11 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
 
             try {
                 // w3c
-                this.nicCommand("insertHTML", html);
+                if (document.queryCommandState("insertHTML")) {
+                    this.nicCommand("insertHTML", html);
+                } else {
+                    throw new Error("Does not support this command");
+                }
             } catch(e) {
                 if (range.insertNode) {
                     // IE
@@ -84431,6 +84435,14 @@ BI.RichEditor = BI.inherit(BI.Widget, {
         readOnly: false
     },
 
+    _defaultConfig: function () {
+        return BI.extend(BI.RichEditor.superclass._defaultConfig.apply(this, arguments), {
+            adjustLength: 1,
+            adjustXOffset: 0,
+            adjustYOffset: 0
+        });
+    },
+
     render: function () {
         var self = this, o = this.options;
         var editor = {
@@ -84467,7 +84479,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             direction: "top,right",
             isNeedAdjustWidth: false,
             isNeedAdjustHeight: false,
-            adjustLength: 1,
+            adjustLength: o.adjustLength,
+            adjustXOffset: o.adjustXOffset,
+            adjustYOffset: o.adjustYOffset,
             ref: function () {
                 self.combo = this;
             },
@@ -84477,7 +84491,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
                     type: "bi.rich_editor_text_toolbar",
                     editor: this.editor
                 }, o.toolbar),
-                height: 30,
+                height: 34,
                 stopPropagation: true,
                 stopEvent: true
             },

src/case/richeditor/bar/action.richeditor.param.js

@@ -48,8 +48,8 @@ BI.RichEditorParamAction = BI.inherit(BI.RichEditorAction, {
         var attrs = BI.DOM.getImage(o.paramFormatter(param));
         image.src = attrs.src;
         image.alt = param;
-        image.style = attrs.style;
         $(image).addClass("rich-editor-param");
+        $(image).attr("style", attrs.style);
         this.options.editor.insertHTML($("<div>").append(image).html());
         // var sel = this._get$Sel();
         // var wrapper = o.editor.instance.getElm().element;

src/case/richeditor/bar/texttoolbar.js

@@ -22,7 +22,7 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
                 {type: "bi.rich_editor_align_right_button"},
                 {type: "bi.rich_editor_param_button"}
             ],
-            height: 28
+            height: 34
         });
     },
 
@@ -44,7 +44,7 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
             element: this,
             items: buttons,
             hgap: 3,
-            vgap: 3
+            vgap: 6
         });
     },
 

src/case/richeditor/niceditor/niceditor.js

@@ -320,7 +320,11 @@
 
             try {
                 // w3c
-                this.nicCommand("insertHTML", html);
+                if (document.queryCommandState("insertHTML")) {
+                    this.nicCommand("insertHTML", html);
+                } else {
+                    throw new Error("Does not support this command");
+                }
             } catch(e) {
                 if (range.insertNode) {
                     // IE

src/case/richeditor/richeditor.js

@@ -13,6 +13,14 @@ BI.RichEditor = BI.inherit(BI.Widget, {
         readOnly: false
     },
 
+    _defaultConfig: function () {
+        return BI.extend(BI.RichEditor.superclass._defaultConfig.apply(this, arguments), {
+            adjustLength: 1,
+            adjustXOffset: 0,
+            adjustYOffset: 0
+        });
+    },
+
     render: function () {
         var self = this, o = this.options;
         var editor = {
@@ -49,7 +57,9 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             direction: "top,right",
             isNeedAdjustWidth: false,
             isNeedAdjustHeight: false,
-            adjustLength: 1,
+            adjustLength: o.adjustLength,
+            adjustXOffset: o.adjustXOffset,
+            adjustYOffset: o.adjustYOffset,
             ref: function () {
                 self.combo = this;
             },
@@ -59,7 +69,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
                     type: "bi.rich_editor_text_toolbar",
                     editor: this.editor
                 }, o.toolbar),
-                height: 30,
+                height: 34,
                 stopPropagation: true,
                 stopEvent: true
             },