Merge pull request #309 in FUI/fineui from ~WINDY/fui:master to master

* commit '5b2309180eab3e5ef208c19e9c2d3e81fb289a20':
  rich_editor修改

demo/js/base/editor/demo.rich_editor.js

@@ -6,7 +6,7 @@ Demo.RichEditor = BI.inherit(BI.Widget, {
         var self = this;
         this.editor = BI.createWidget({
             type: "bi.rich_editor",
-            cls: "mvc-border",
+            cls: "bi-border",
             width: 600,
             height: 400
         });

dist/bundle.js

@@ -82291,7 +82291,6 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
                 scrollable: false
             });
             this.elm.element.css({
-                margin: "4px",
                 minHeight: (o.height - 8) + "px",
                 outline: "none"
             }).html(o.value);
@@ -82886,7 +82885,6 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, {
                 backgroundColor: backgroundColor,
                 color: BI.DOM.getContrastColor(backgroundColor)
             });
-            this.setValue("");
         });
     },
 
@@ -83074,7 +83072,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             element: this,
             toggle: false,
             trigger: o.readOnly ? "" : "click",
-            direction: "top,left",
+            direction: "top,right",
             isNeedAdjustWidth: false,
             isNeedAdjustHeight: false,
             adjustLength: 1,

dist/case.js

@@ -10360,7 +10360,6 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
                 scrollable: false
             });
             this.elm.element.css({
-                margin: "4px",
                 minHeight: (o.height - 8) + "px",
                 outline: "none"
             }).html(o.value);
@@ -10955,7 +10954,6 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, {
                 backgroundColor: backgroundColor,
                 color: BI.DOM.getContrastColor(backgroundColor)
             });
-            this.setValue("");
         });
     },
 
@@ -11143,7 +11141,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             element: this,
             toggle: false,
             trigger: o.readOnly ? "" : "click",
-            direction: "top,left",
+            direction: "top,right",
             isNeedAdjustWidth: false,
             isNeedAdjustHeight: false,
             adjustLength: 1,

dist/demo.js

@@ -859,7 +859,7 @@ BI.shortcut("demo.multifile_editor", Demo.CodeEditor);Demo.RichEditor = BI.inher
         var self = this;
         this.editor = BI.createWidget({
             type: "bi.rich_editor",
-            cls: "mvc-border",
+            cls: "bi-border",
             width: 600,
             height: 400
         });

src/case/richeditor/niceditor/niceditor.js

@@ -101,7 +101,6 @@
                 scrollable: false
             });
             this.elm.element.css({
-                margin: "4px",
                 minHeight: (o.height - 8) + "px",
                 outline: "none"
             }).html(o.value);

src/case/richeditor/plugins/combo.backgroundcolorchooser.js

@@ -33,7 +33,6 @@ BI.RichEditorBackgroundColorChooser = BI.inherit(BI.RichEditorAction, {
                 backgroundColor: backgroundColor,
                 color: BI.DOM.getContrastColor(backgroundColor)
             });
-            this.setValue("");
         });
     },
 

src/case/richeditor/richeditor.js

@@ -41,7 +41,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
             element: this,
             toggle: false,
             trigger: o.readOnly ? "" : "click",
-            direction: "top,left",
+            direction: "top,right",
             isNeedAdjustWidth: false,
             isNeedAdjustHeight: false,
             adjustLength: 1,