From a40bd55c8a8c838c2407b25c44e9036043a22a7a Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 5 Jan 2021 17:18:23 +0800 Subject: [PATCH] sync --- docs/src/Roo_bootstrap_Markdown.js.html | 12 ++++++++++-- docs/src/Roo_bootstrap_Table.js.html | 3 ++- roojs-bootstrap-debug.js | 8 ++++++-- roojs-bootstrap.js | 8 ++++---- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/docs/src/Roo_bootstrap_Markdown.js.html b/docs/src/Roo_bootstrap_Markdown.js.html index 94b62ebb12..2e1765fb38 100644 --- a/docs/src/Roo_bootstrap_Markdown.js.html +++ b/docs/src/Roo_bootstrap_Markdown.js.html @@ -30,7 +30,11 @@ cls : 'roo-markdown-area' }); this.inputEl().addClass('d-none'); - this.markdownEl.dom.innerHTML = Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(this.getValue())); + var v = this.getValue(); + if (v === false) { + v = ''; + } + this.markdownEl.dom.innerHTML = Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(v)); this.markdownEl.on('click', this.toggleTextEdit, this); this.on('blur', this.toggleTextEdit, this); this.on('specialkey', this.resizeTextArea, this); @@ -61,7 +65,11 @@ this.markdownEl.dom.innerHTML = String.format('<span class="roo-placeholder">{0}</span>', this.placeholder); return; } - this.markdownEl.dom.innerHTML = Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(this.getValue())); + var v = this.getValue(); + if (v === false) { + v = ''; + } + this.markdownEl.dom.innerHTML = Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(v)); }, resizeTextArea: function () { diff --git a/docs/src/Roo_bootstrap_Table.js.html b/docs/src/Roo_bootstrap_Table.js.html index 434a26f8aa..02eb054fc1 100644 --- a/docs/src/Roo_bootstrap_Table.js.html +++ b/docs/src/Roo_bootstrap_Table.js.html @@ -1093,6 +1093,7 @@ var tfd = this.getGridEl().select('tfoot', true).first(); var cw = ctr.getWidth(); + this.getGridEl().select('tfoot tr, tfoot td',true).setWidth(cw); if (tbd) { @@ -1107,7 +1108,7 @@ } cw = Math.max(cw, this.totalWidth); this.getGridEl().select('tbody tr',true).setWidth(cw); - this.getGridEl().select('tfoot tr, tfoot td',true).setWidth(cw); + // resize 'expandable coloumn? return; // we doe not have a view in this design.. diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index aa80c162aa..3b11f1fa05 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -26146,7 +26146,7 @@ Roo.extend(Roo.bootstrap.Markdown, Roo.bootstrap.TextArea, { if (v === false) { v = ''; } - this.markdownEl.dom.innerHTML = Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(this.getValue())); + this.markdownEl.dom.innerHTML = Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(v)); this.markdownEl.on('click', this.toggleTextEdit, this); this.on('blur', this.toggleTextEdit, this); this.on('specialkey', this.resizeTextArea, this); @@ -26177,7 +26177,11 @@ Roo.extend(Roo.bootstrap.Markdown, Roo.bootstrap.TextArea, { this.markdownEl.dom.innerHTML = String.format('{0}', this.placeholder); return; } - this.markdownEl.dom.innerHTML = Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(this.getValue())); + var v = this.getValue(); + if (v === false) { + v = ''; + } + this.markdownEl.dom.innerHTML = Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(v)); }, resizeTextArea: function () { diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 7c658d6d1e..f8acffbd27 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -1095,10 +1095,10 @@ A.get('align-center').setActive(B.queryCommandState('justifycenter'));A.get('ali this.editor.toggleSourceEdit(A);}}); // Roo/bootstrap/Markdown.js Roo.bootstrap.Markdown=function(A){Roo.bootstrap.Markdown.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.Markdown,Roo.bootstrap.TextArea,{editing:false,initEvents:function(){Roo.bootstrap.TextArea.prototype.initEvents.call(this);this.markdownEl=this.el.createChild({cls:'roo-markdown-area'} -);this.inputEl().addClass('d-none');var v=this.getValue();if(v===false){v='';}this.markdownEl.dom.innerHTML=Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(this.getValue()));this.markdownEl.on('click',this.toggleTextEdit,this);this.on('blur',this.toggleTextEdit,this); -this.on('specialkey',this.resizeTextArea,this);},toggleTextEdit:function(){var sh=this.markdownEl.getHeight();this.inputEl().addClass('d-none');this.markdownEl.addClass('d-none');if(!this.editing){this.inputEl().setHeight(Math.min(500,Math.max(sh,(this.getValue().split("\n").length+1)*30))); -this.inputEl().removeClass('d-none');this.inputEl().focus();this.editing=true;return;}this.updateMarkdown();this.markdownEl.removeClass('d-none');this.editing=false;return;},updateMarkdown:function(){if(this.getValue()==''){this.markdownEl.dom.innerHTML=String.format('{0}',this.placeholder); -return;}this.markdownEl.dom.innerHTML=Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(this.getValue()));},resizeTextArea:function(){var sh=100;Roo.log([sh,this.getValue().split("\n").length*30]);this.inputEl().setHeight(Math.min(500,Math.max(sh,(this.getValue().split("\n").length+1)*30))); +);this.inputEl().addClass('d-none');var v=this.getValue();if(v===false){v='';}this.markdownEl.dom.innerHTML=Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(v));this.markdownEl.on('click',this.toggleTextEdit,this);this.on('blur',this.toggleTextEdit,this);this.on('specialkey',this.resizeTextArea,this); +},toggleTextEdit:function(){var sh=this.markdownEl.getHeight();this.inputEl().addClass('d-none');this.markdownEl.addClass('d-none');if(!this.editing){this.inputEl().setHeight(Math.min(500,Math.max(sh,(this.getValue().split("\n").length+1)*30)));this.inputEl().removeClass('d-none'); +this.inputEl().focus();this.editing=true;return;}this.updateMarkdown();this.markdownEl.removeClass('d-none');this.editing=false;return;},updateMarkdown:function(){if(this.getValue()==''){this.markdownEl.dom.innerHTML=String.format('{0}',this.placeholder); +return;}var v=this.getValue();if(v===false){v='';}this.markdownEl.dom.innerHTML=Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(v));},resizeTextArea:function(){var sh=100;Roo.log([sh,this.getValue().split("\n").length*30]);this.inputEl().setHeight(Math.min(500,Math.max(sh,(this.getValue().split("\n").length+1)*30))); },setValue:function(A){Roo.bootstrap.TextArea.prototype.setValue.call(this,A);if(!this.editing){this.updateMarkdown();}},focus:function(){if(!this.editing){this.toggleTextEdit();}}}); // Roo/bootstrap/Table/AbstractSelectionModel.js Roo.bootstrap.Table.AbstractSelectionModel=function(){this.locked=false;Roo.bootstrap.Table.AbstractSelectionModel.superclass.constructor.call(this);};Roo.extend(Roo.bootstrap.Table.AbstractSelectionModel,Roo.util.Observable,{init:function(A){this.grid=A;this.initEvents(); -- 2.39.2