Roo/HtmlEditorCore.js

roojs-ui.js
roojs-ui-debug.js
roojs-all.js
roojs-debug.js

diff --git a/Roo/HtmlEditorCore.js b/Roo/HtmlEditorCore.js
index 72be258..b355738 100644 (file)
--- a/Roo/HtmlEditorCore.js
+++ b/Roo/HtmlEditorCore.js
@@ -527,7 +527,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
         var txt = e.browserEvent.clipboardData.getData('Text'); // clipboard event
         var d = document.createElement('div');
         d.innerHTML = txt;
-        new Roo.htmleditor.FilterWord(d);
+        new Roo.htmleditor.FilterWord({ node : d });
         this.insertAtCursor(d.innerHTML);
         
         e.preventDefault();

diff --git a/roojs-all.js b/roojs-all.js
index a54c6f5..4b34349 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -1905,7 +1905,7 @@ d.innerHTML=v;this.el.dom.value=d.innerHTML;this.owner.fireEvent('push',this,v);
 }else{if(!Roo.get(this.frameId)&&!A.contentDocument){return;}this.doc=(A.contentDocument||Roo.get(this.frameId).dom.document);this.win=(A.contentWindow||Roo.get(this.frameId).dom.contentWindow);}},initEditor:function(){this.assignDocWin();this.doc.designMode="on";
 this.doc.open();this.doc.write(this.getDocMarkup());this.doc.close();var A=(this.doc.body||this.doc.documentElement);A.bgProperties='fixed';Roo.EventManager.on(this.doc,{'mouseup':this.onEditorEvent,'dblclick':this.onEditorEvent,'click':this.onEditorEvent,'keyup':this.onEditorEvent,'paste':this.onPasteEvent,buffer:100,scope:this}
 );if(Roo.isGecko){Roo.EventManager.on(this.doc,'keypress',this.mozKeyPress,this);}if(Roo.isIE||Roo.isSafari||Roo.isOpera){Roo.EventManager.on(this.doc,'keydown',this.fixKeys,this);}this.initialized=true;new Roo.htmleditor.KeyEnter({core:this});this.owner.fireEvent('initialize',this);
-this.pushValue();},onPasteEvent:function(e,v){var A=e.browserEvent.clipboardData.getData('Text');var d=document.createElement('div');d.innerHTML=A;new Roo.htmleditor.FilterWord(d);this.insertAtCursor(d.innerHTML);e.preventDefault();return false;},onDestroy:function(){if(this.rendered){}
+this.pushValue();},onPasteEvent:function(e,v){var A=e.browserEvent.clipboardData.getData('Text');var d=document.createElement('div');d.innerHTML=A;new Roo.htmleditor.FilterWord({node:d});this.insertAtCursor(d.innerHTML);e.preventDefault();return false;},onDestroy:function(){if(this.rendered){}
 },onFirstFocus:function(){this.assignDocWin();this.activated=true;if(Roo.isGecko){this.win.focus();var s=this.win.getSelection();if(!s.focusNode||s.focusNode.nodeType!=3){var r=s.getRangeAt(0);r.selectNodeContents((this.doc.body||this.doc.documentElement));
 r.collapse(true);this.deferFocus();}try{this.execCmd('useCSS',true);this.execCmd('styleWithCSS',false);}catch(e){}}this.owner.fireEvent('activate',this);},adjustFont:function(A){var B=A.cmd=='increasefontsize'?1:-1;var v=parseInt(this.doc.queryCommandValue('FontSize')||3,10);
 if(Roo.isSafari){var sm={10:1,13:2,16:3,18:4,24:5,32:6,48:7};v=(v<10)?10:v;v=(v>48)?48:v;v=typeof(sm[v])=='undefined'?1:sm[v];}v=Math.max(1,v+B);this.execCmd('FontSize',v);},onEditorEvent:function(e){this.owner.fireEvent('editorevent',this,e);this.syncValue();

diff --git a/roojs-debug.js b/roojs-debug.js
index 62a15a8..2cd564d 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -46012,7 +46012,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
         var txt = e.browserEvent.clipboardData.getData('Text'); // clipboard event
         var d = document.createElement('div');
         d.innerHTML = txt;
-        new Roo.htmleditor.FilterWord(d);
+        new Roo.htmleditor.FilterWord({ node : d });
         this.insertAtCursor(d.innerHTML);
         
         e.preventDefault();

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index aaa0df5..7fadd79 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -22044,7 +22044,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
         var txt = e.browserEvent.clipboardData.getData('Text'); // clipboard event
         var d = document.createElement('div');
         d.innerHTML = txt;
-        new Roo.htmleditor.FilterWord(d);
+        new Roo.htmleditor.FilterWord({ node : d });
         this.insertAtCursor(d.innerHTML);
         
         e.preventDefault();

diff --git a/roojs-ui.js b/roojs-ui.js
index c1567ce..d791fd7 100644 (file)
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -981,7 +981,7 @@ d.innerHTML=v;this.el.dom.value=d.innerHTML;this.owner.fireEvent('push',this,v);
 }else{if(!Roo.get(this.frameId)&&!A.contentDocument){return;}this.doc=(A.contentDocument||Roo.get(this.frameId).dom.document);this.win=(A.contentWindow||Roo.get(this.frameId).dom.contentWindow);}},initEditor:function(){this.assignDocWin();this.doc.designMode="on";
 this.doc.open();this.doc.write(this.getDocMarkup());this.doc.close();var A=(this.doc.body||this.doc.documentElement);A.bgProperties='fixed';Roo.EventManager.on(this.doc,{'mouseup':this.onEditorEvent,'dblclick':this.onEditorEvent,'click':this.onEditorEvent,'keyup':this.onEditorEvent,'paste':this.onPasteEvent,buffer:100,scope:this}
 );if(Roo.isGecko){Roo.EventManager.on(this.doc,'keypress',this.mozKeyPress,this);}if(Roo.isIE||Roo.isSafari||Roo.isOpera){Roo.EventManager.on(this.doc,'keydown',this.fixKeys,this);}this.initialized=true;new Roo.htmleditor.KeyEnter({core:this});this.owner.fireEvent('initialize',this);
-this.pushValue();},onPasteEvent:function(e,v){var A=e.browserEvent.clipboardData.getData('Text');var d=document.createElement('div');d.innerHTML=A;new Roo.htmleditor.FilterWord(d);this.insertAtCursor(d.innerHTML);e.preventDefault();return false;},onDestroy:function(){if(this.rendered){}
+this.pushValue();},onPasteEvent:function(e,v){var A=e.browserEvent.clipboardData.getData('Text');var d=document.createElement('div');d.innerHTML=A;new Roo.htmleditor.FilterWord({node:d});this.insertAtCursor(d.innerHTML);e.preventDefault();return false;},onDestroy:function(){if(this.rendered){}
 },onFirstFocus:function(){this.assignDocWin();this.activated=true;if(Roo.isGecko){this.win.focus();var s=this.win.getSelection();if(!s.focusNode||s.focusNode.nodeType!=3){var r=s.getRangeAt(0);r.selectNodeContents((this.doc.body||this.doc.documentElement));
 r.collapse(true);this.deferFocus();}try{this.execCmd('useCSS',true);this.execCmd('styleWithCSS',false);}catch(e){}}this.owner.fireEvent('activate',this);},adjustFont:function(A){var B=A.cmd=='increasefontsize'?1:-1;var v=parseInt(this.doc.queryCommandValue('FontSize')||3,10);
 if(Roo.isSafari){var sm={10:1,13:2,16:3,18:4,24:5,32:6,48:7};v=(v<10)?10:v;v=(v>48)?48:v;v=typeof(sm[v])=='undefined'?1:sm[v];}v=Math.max(1,v+B);this.execCmd('FontSize',v);},onEditorEvent:function(e){this.owner.fireEvent('editorevent',this,e);this.syncValue();