From f218d223167493cfed3cbcc1f9a1a27e88d3760d Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 29 Mar 2018 14:31:30 +0800 Subject: [PATCH] =?UTF-8?q?rich=5Feditor=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/base/editor/demo.rich_editor.js | 2 +- dist/bundle.js | 4 +--- dist/case.js | 4 +--- dist/demo.js | 2 +- src/case/richeditor/niceditor/niceditor.js | 1 - src/case/richeditor/plugins/combo.backgroundcolorchooser.js | 1 - src/case/richeditor/richeditor.js | 2 +- 7 files changed, 5 insertions(+), 11 deletions(-) diff --git a/demo/js/base/editor/demo.rich_editor.js b/demo/js/base/editor/demo.rich_editor.js index 72dbfdbd1..61059fc2d 100644 --- a/demo/js/base/editor/demo.rich_editor.js +++ b/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 }); diff --git a/dist/bundle.js b/dist/bundle.js index 02df71548..63cfcac9d 100644 --- a/dist/bundle.js +++ b/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, diff --git a/dist/case.js b/dist/case.js index d32e38344..527371664 100644 --- a/dist/case.js +++ b/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, diff --git a/dist/demo.js b/dist/demo.js index 6bd99c225..23a00fd2b 100644 --- a/dist/demo.js +++ b/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 }); diff --git a/src/case/richeditor/niceditor/niceditor.js b/src/case/richeditor/niceditor/niceditor.js index 60f9cba05..6fdc2ce4f 100644 --- a/src/case/richeditor/niceditor/niceditor.js +++ b/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); diff --git a/src/case/richeditor/plugins/combo.backgroundcolorchooser.js b/src/case/richeditor/plugins/combo.backgroundcolorchooser.js index 1fef1b6c6..d6b4d8fdd 100644 --- a/src/case/richeditor/plugins/combo.backgroundcolorchooser.js +++ b/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(""); }); }, diff --git a/src/case/richeditor/richeditor.js b/src/case/richeditor/richeditor.js index 48fd68c36..e7f8acc22 100644 --- a/src/case/richeditor/richeditor.js +++ b/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,