From e726be5859fd8851631f364fbc54df6e8ad890e1 Mon Sep 17 00:00:00 2001 From: fay Date: Mon, 2 Jul 2018 14:53:42 +0800 Subject: [PATCH 1/2] BI-25599 --- src/widget/downlist/popup.downlist.js | 2 +- src/widget/multilayerdownlist/popup.downlist.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/downlist/popup.downlist.js b/src/widget/downlist/popup.downlist.js index 4a3f4f66c..f9974604a 100644 --- a/src/widget/downlist/popup.downlist.js +++ b/src/widget/downlist/popup.downlist.js @@ -160,7 +160,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { }], cls: "bi-down-list-spliter-container cursor-pointer", lgap: 10, - rgap: 10 + rgap: 0 }); result.push(spliter_container); } diff --git a/src/widget/multilayerdownlist/popup.downlist.js b/src/widget/multilayerdownlist/popup.downlist.js index e50711a02..e42d28bac 100644 --- a/src/widget/multilayerdownlist/popup.downlist.js +++ b/src/widget/multilayerdownlist/popup.downlist.js @@ -167,7 +167,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { }], cls: "bi-down-list-spliter-container cursor-pointer", lgap: 10, - rgap: 10 + rgap: 0 }); result.push(spliter_container); } From ef809418728ea2bb0bc363430ef800c886773c92 Mon Sep 17 00:00:00 2001 From: fay Date: Wed, 4 Jul 2018 11:59:43 +0800 Subject: [PATCH 2/2] update --- src/case/richeditor/bar/texttoolbar.js | 5 ----- src/case/richeditor/niceditor/niceditor.js | 8 ++++++++ src/case/richeditor/richeditor.js | 4 ++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/case/richeditor/bar/texttoolbar.js b/src/case/richeditor/bar/texttoolbar.js index 0ef5729ff..9e5fd6c3d 100644 --- a/src/case/richeditor/bar/texttoolbar.js +++ b/src/case/richeditor/bar/texttoolbar.js @@ -34,11 +34,6 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, { editor: o.editor }); })); - this.element.mousedown(function (e) { - BI.each(buttons, function (i, btn) { - btn.hideIf(e); - }); - }); BI.createWidget({ type: "bi.left", element: this, diff --git a/src/case/richeditor/niceditor/niceditor.js b/src/case/richeditor/niceditor/niceditor.js index 3633e3e77..bd0895c0b 100644 --- a/src/case/richeditor/niceditor/niceditor.js +++ b/src/case/richeditor/niceditor/niceditor.js @@ -91,6 +91,10 @@ return this.instance.getContent(); }, + getContentHeight: function () { + return this.instance.getContentHeight(); + }, + getInstance: function () { return this.instance; }, @@ -300,6 +304,10 @@ return this.content; }, + getContentHeight: function () { + return this.elm.element.height(); + }, + setContent: function (e) { this.content = e; this.ne.fireEvent("set"); diff --git a/src/case/richeditor/richeditor.js b/src/case/richeditor/richeditor.js index 6ff9b1545..2e91ea6a1 100644 --- a/src/case/richeditor/richeditor.js +++ b/src/case/richeditor/richeditor.js @@ -99,6 +99,10 @@ BI.RichEditor = BI.inherit(BI.Widget, { getValue: function () { return this.editor.getValue(); + }, + + getContentHeight: function () { + return this.editor.getContentHeight(); } }); BI.RichEditor.EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";