Browse Source

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

* commit 'ef809418728ea2bb0bc363430ef800c886773c92':
  update
  BI-25599
es6
imp 6 years ago
parent
commit
6660c1725d
  1. 5
      src/case/richeditor/bar/texttoolbar.js
  2. 8
      src/case/richeditor/niceditor/niceditor.js
  3. 4
      src/case/richeditor/richeditor.js

5
src/case/richeditor/bar/texttoolbar.js

@ -34,11 +34,6 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
editor: o.editor editor: o.editor
}); });
})); }));
this.element.mousedown(function (e) {
BI.each(buttons, function (i, btn) {
btn.hideIf(e);
});
});
BI.createWidget({ BI.createWidget({
type: "bi.left", type: "bi.left",
element: this, element: this,

8
src/case/richeditor/niceditor/niceditor.js

@ -91,6 +91,10 @@
return this.instance.getContent(); return this.instance.getContent();
}, },
getContentHeight: function () {
return this.instance.getContentHeight();
},
getInstance: function () { getInstance: function () {
return this.instance; return this.instance;
}, },
@ -300,6 +304,10 @@
return this.content; return this.content;
}, },
getContentHeight: function () {
return this.elm.element.height();
},
setContent: function (e) { setContent: function (e) {
this.content = e; this.content = e;
this.ne.fireEvent("set"); this.ne.fireEvent("set");

4
src/case/richeditor/richeditor.js

@ -99,6 +99,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
getValue: function () { getValue: function () {
return this.editor.getValue(); return this.editor.getValue();
},
getContentHeight: function () {
return this.editor.getContentHeight();
} }
}); });
BI.RichEditor.EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW"; BI.RichEditor.EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";

Loading…
Cancel
Save