From 5d82d3024a93a1d0c6b7a1c1e534ef338a2d2174 Mon Sep 17 00:00:00 2001 From: Alan Date: Tue, 15 Aug 2023 12:33:01 +0800 Subject: [PATCH] fix #7775 - BlockFigure caption_edit option - to enable/disable caption editing --- docs/src/Roo_bootstrap_form_DateField.js.html | 2 +- docs/src/Roo_bootstrap_form_TimeField.js.html | 4 ++-- docs/src/Roo_htmleditor_BlockFigure.js.html | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/src/Roo_bootstrap_form_DateField.js.html b/docs/src/Roo_bootstrap_form_DateField.js.html index ecd83b4a6e..105f19a4c7 100644 --- a/docs/src/Roo_bootstrap_form_DateField.js.html +++ b/docs/src/Roo_bootstrap_form_DateField.js.html @@ -186,7 +186,7 @@ } translation.months.push(month); - translation/monthsShort.push(monthShort); + translation.monthsShort.push(monthShort); } }, diff --git a/docs/src/Roo_bootstrap_form_TimeField.js.html b/docs/src/Roo_bootstrap_form_TimeField.js.html index 6c228ac346..0fc421bd81 100644 --- a/docs/src/Roo_bootstrap_form_TimeField.js.html +++ b/docs/src/Roo_bootstrap_form_TimeField.js.html @@ -292,11 +292,11 @@ update: function() { // default minute is a multiple of minuteStep - if(typeof(this.time) === 'undefined') { + if(typeof(this.time) === 'undefined' || this.time.length == 0) { this.time = new Date(); this.time = this.time.add(Date.MINUTE, Math.round(parseInt(this.time.format('i')) / this.minuteStep) * this.minuteStep - parseInt(this.time.format('i'))); } - this.time = (typeof(this.time) === 'undefined') ? new Date() : this.time; + this.time = (typeof(this.time) === 'undefined' || this.time.length == 0) ? new Date() : this.time; this.fill(); }, diff --git a/docs/src/Roo_htmleditor_BlockFigure.js.html b/docs/src/Roo_htmleditor_BlockFigure.js.html index 4991c1e3c3..2670010ad7 100644 --- a/docs/src/Roo_htmleditor_BlockFigure.js.html +++ b/docs/src/Roo_htmleditor_BlockFigure.js.html @@ -369,7 +369,7 @@ { // we can not rely on yahoo syndication to use CSS elements - so have to use '<i>' to encase stuff. tag : 'i', - contenteditable : true, + contenteditable : Roo.htmleditor.BlockFigure.caption_edit, html : captionhtml } @@ -426,6 +426,10 @@ -}) +}); + +Roo.apply(Roo.htmleditor.BlockFigure, { + caption_edit : true +}); \ No newline at end of file -- 2.39.2