From 24bab7de220b19ec4e5f84ae48afdafcc44d355b Mon Sep 17 00:00:00 2001 From: Alan Date: Tue, 9 May 2023 15:53:52 +0800 Subject: [PATCH] fix #7634 copy and paste html --- Roo/HtmlEditorCore.js | 4 ++-- docs/src/Roo_bootstrap_panel_Content.js.html | 2 +- roojs-bootstrap-debug.js | 6 +++--- roojs-bootstrap.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Roo/HtmlEditorCore.js b/Roo/HtmlEditorCore.js index 6599b4d059..2dd07c93bb 100644 --- a/Roo/HtmlEditorCore.js +++ b/Roo/HtmlEditorCore.js @@ -646,8 +646,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { var parser = new Roo.rtf.Parser(cd.getData('text/rtf')); images = parser.doc ? parser.doc.getElementsByType('pict') : []; } - //Roo.log(images); - //Roo.log(imgs); + // Roo.log(images); + // Roo.log(imgs); // fixme.. images = images.filter(function(g) { return !g.path.match(/^rtf\/(head|pgdsctbl|listtable|footerf)/); }) // ignore headers/footers etc. .map(function(g) { return g.toDataURL(); }) diff --git a/docs/src/Roo_bootstrap_panel_Content.js.html b/docs/src/Roo_bootstrap_panel_Content.js.html index 83e456d945..1b72c7f4c7 100644 --- a/docs/src/Roo_bootstrap_panel_Content.js.html +++ b/docs/src/Roo_bootstrap_panel_Content.js.html @@ -70,7 +70,7 @@ { tag : 'iframe', style : 'border: 0px', - src : 'about:blank' + src : 'data:text/html,%3Cbody%3E%3C%2Fbody%3E' } ]; } diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 1eba33e06b..2e05d7902c 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -31446,8 +31446,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component, { var parser = new Roo.rtf.Parser(cd.getData('text/rtf')); images = parser.doc ? parser.doc.getElementsByType('pict') : []; } - //Roo.log(images); - //Roo.log(imgs); + // Roo.log(images); + // Roo.log(imgs); // fixme.. images = images.filter(function(g) { return !g.path.match(/^rtf\/(head|pgdsctbl|listtable|footerf)/); }) // ignore headers/footers etc. .map(function(g) { return g.toDataURL(); }) @@ -45336,7 +45336,7 @@ Roo.bootstrap.panel.Content = function( config){ { tag : 'iframe', style : 'border: 0px', - src : 'about:blank' + src : 'data:text/html,%3Cbody%3E%3C%2Fbody%3E' } ]; } diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 283d17e4b4..02a61ad710 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -1971,7 +1971,7 @@ Roo.bootstrap.layout.West=function(A){A.region="west";A.cursor="w-resize";Roo.bo A.width-=sw;this.split.el.setLeft(A.x+A.width);this.split.el.setTop(A.y);this.split.el.setHeight(A.height);}if(this.collapsed){this.updateBody(null,A.height);}Roo.bootstrap.layout.Region.prototype.updateBox.call(this,A);}}); // Roo/bootstrap/panel/Content.js Roo.bootstrap.panel.Content=function(A){this.tpl=A.tpl||false;var el=A.el;var B=A.content;if(A.autoCreate){el=Roo.id();}this.el=Roo.get(el);if(!this.el&&A&&A.autoCreate){if(typeof A.autoCreate=="object"){if(!A.autoCreate.id){A.autoCreate.id=A.id||el;}this.el=Roo.DomHelper.append(document.body,A.autoCreate,true); -}else{var C={tag:"div",cls:(A.cls||'')+(A.background?' bg-'+A.background:'')+" roo-layout-inactive-content",id:A.id||el};if(A.iframe){C.cn=[{tag:'iframe',style:'border: 0px',src:'about:blank'}];}if(A.html){C.html=A.html;}this.el=Roo.DomHelper.append(document.body,C,true); +}else{var C={tag:"div",cls:(A.cls||'')+(A.background?' bg-'+A.background:'')+" roo-layout-inactive-content",id:A.id||el};if(A.iframe){C.cn=[{tag:'iframe',style:'border: 0px',src:'data:text/html,%3Cbody%3E%3C%2Fbody%3E'}];}if(A.html){C.html=A.html;}this.el=Roo.DomHelper.append(document.body,C,true); if(A.iframe){this.iframeEl=this.el.select('iframe',true).first();}}}this.closable=false;this.loaded=false;this.active=false;if(A.toolbar&&!A.toolbar.el&&A.toolbar.xtype){this.toolbar=new A.toolbar.xns[A.toolbar.xtype](A.toolbar);this.wrapEl=this.el;var ti=[]; if(A.toolbar.items){ti=A.toolbar.items;delete A.toolbar.items;}var D=[];this.toolbar.render(this.wrapEl,'before');for(var i=0;i