From f89692035232b0f9e3fd39ebe015fd3f572cc97c Mon Sep 17 00:00:00 2001 From: Andrej Date: Tue, 18 Jul 2017 09:56:12 +0200 Subject: [PATCH] Fixed bug - editor not disabled --- src/BootstrapRTE/widget/BootstrapRTE.js | 15 +++++++++++++-- test/widgets/BootstrapRTE.mpk | Bin 335094 -> 335167 bytes 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/BootstrapRTE/widget/BootstrapRTE.js b/src/BootstrapRTE/widget/BootstrapRTE.js index 18e879d..12cba2f 100644 --- a/src/BootstrapRTE/widget/BootstrapRTE.js +++ b/src/BootstrapRTE/widget/BootstrapRTE.js @@ -116,6 +116,8 @@ define([ if (this.readOnly || this.get("disabled") || this.readonly || this._strReadOnly()) { this._readOnly = true; + + this._disableEditing();//in case the widget is already constructed } // set the content on update @@ -129,6 +131,16 @@ define([ this._executeCallback(callback, "update"); }, + _disableEditing: function() { + try { + $(this.inputNode).attr("contenteditable", "false"); + $("#" + this._toolbarId).find("a").addClass("disabled"); + } + catch ( e ) { + logger.debug(e); + } + }, + _setupWidget: function (callback) { logger.debug(this.id + "._setupWidget"); this._setup = true; @@ -269,8 +281,7 @@ define([ }); if (this._readOnly) { - $(this.inputNode).attr("contenteditable", "false"); - $("#" + this._toolbarId).find("a").addClass("disabled"); + this._disableEditing(); } this._addListeners(); diff --git a/test/widgets/BootstrapRTE.mpk b/test/widgets/BootstrapRTE.mpk index dd1cd9671ec3c6b936ebc26094b3d1ecb1e4cb63..3bb56e25a34f192bc52825daf136e72fb0300b16 100644 GIT binary patch delta 4732 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 O7U2*m-X08cPWcbTpb=^S delta 4480 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 RAS9S5M2xYNA9B$3{{c*u*>wN_