Browse Source

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

* commit '5b2309180eab3e5ef208c19e9c2d3e81fb289a20':
  rich_editor修改
es6
guy 7 years ago
parent
commit
74c2ff88c7
  1. 2
      demo/js/base/editor/demo.rich_editor.js
  2. 4
      dist/bundle.js
  3. 4
      dist/case.js
  4. 2
      dist/demo.js
  5. 1
      src/case/richeditor/niceditor/niceditor.js
  6. 1
      src/case/richeditor/plugins/combo.backgroundcolorchooser.js
  7. 2
      src/case/richeditor/richeditor.js

2
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
});

4
dist/bundle.js vendored

@ -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,

4
dist/case.js vendored

@ -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,

2
dist/demo.js vendored

@ -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
});

1
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);

1
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("");
});
},

2
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,

Loading…
Cancel
Save