sync

diff --git a/Roo/htmleditor/FilterAttributes.js b/Roo/htmleditor/FilterAttributes.js
index 3337789..6ef231a 100644 (file)
--- a/Roo/htmleditor/FilterAttributes.js
+++ b/Roo/htmleditor/FilterAttributes.js
@@ -94,7 +94,11 @@ Roo.extend(Roo.htmleditor.FilterAttributes, Roo.htmleditor.Filter,
         if (v.match(/^\./) || v.match(/^\//)) {
             return;
         }
-        if (v.match(/^(http|https):\/\//) || v.match(/^mailto:/) || v.match(/^ftp:/)) {
+        if (v.match(/^(http|https):\/\//)
+            || v.match(/^mailto:/) 
+            || v.match(/^ftp:/)
+            || v.match(/^data:/)
+            ) {
             return;
         }
         if (v.match(/^#/)) {

diff --git a/Roo/htmleditor/FilterKeepChildren.js b/Roo/htmleditor/FilterKeepChildren.js
index fbee647..de74237 100644 (file)
--- a/Roo/htmleditor/FilterKeepChildren.js
+++ b/Roo/htmleditor/FilterKeepChildren.js
@@ -22,7 +22,7 @@ Roo.extend(Roo.htmleditor.FilterKeepChildren, Roo.htmleditor.FilterBlack,
     replaceTag : function(node)
     {
         // walk children...
-        Roo.log(node);
+        //Roo.log(node);
         var ar = Array.from(node.childNodes);
         //remove first..
         for (var i = 0; i < ar.length; i++) {

diff --git a/Roo/htmleditor/FilterParagraph.js b/Roo/htmleditor/FilterParagraph.js
index 5d76663..5c5f227 100644 (file)
--- a/Roo/htmleditor/FilterParagraph.js
+++ b/Roo/htmleditor/FilterParagraph.js
@@ -42,6 +42,7 @@ Roo.extend(Roo.htmleditor.FilterParagraph, Roo.htmleditor.Filter,
         
         // double BR.
         node.parentNode.insertBefore(node.ownerDocument.createElement('BR'), node);
+        node.parentNode.insertBefore(node.ownerDocument.createElement('BR'), node);
         node.parentNode.removeChild(node);
         
         return false;

diff --git a/Roo/rtf/Group.js b/Roo/rtf/Group.js
index bc6db3e..1adfef5 100644 (file)
--- a/Roo/rtf/Group.js
+++ b/Roo/rtf/Group.js
@@ -3,17 +3,24 @@ Roo.rtf.Group = function(parent)
 {
     // we dont want to acutally store parent - it will make debug a nightmare..
     this.content = [];
+    this.cn  = [];
+     
+       
     
 };
 
 Roo.rtf.Group.prototype = {
     ignorable : false,
     content: false,
+    cn: false,
     addContent : function(node) {
         // could set styles...
         this.content.push(node);
     },
-    
+    addChild : function(cn)
+    {
+        this.cn.push(cn);
+    },
     // only for images really...
     toDataURL : function()
     {
@@ -32,7 +39,7 @@ Roo.rtf.Group.prototype = {
         
         var hexstring = this.content[this.content.length-1].value;
         
-        return mimetype + ';base64,' + btoa(hexstring.match(/\w{2}/g).map(function(a) {
+        return 'data:' + mimetype + ';base64,' + btoa(hexstring.match(/\w{2}/g).map(function(a) {
             return String.fromCharCode(parseInt(a, 16));
         }).join(""));
     }

diff --git a/Roo/rtf/Parser.js b/Roo/rtf/Parser.js
index 67c4bfb..01e589f 100644 (file)
--- a/Roo/rtf/Parser.js
+++ b/Roo/rtf/Parser.js
@@ -15,20 +15,33 @@
 
 
 
-Roo.rtf.Parser = function() {
+Roo.rtf.Parser = function(text) {
     //super({objectMode: true})
     this.text = '';
     this.parserState = this.parseText;
     
     // these are for interpeter...
-    this.doc = document;
+    this.doc = {};
     ///this.parserState = this.parseTop
     this.groupStack = [];
     this.hexStore = [];
-    this.doc = false; //new Roo.rtf.Document();
+    this.doc = false;
     
     this.groups = []; // where we put the return.
-    // default is to parse TEXT...
+    
+    for (var ii = 0; ii < text.length; ++ii) {
+        ++this.cpos;
+        
+        if (text[ii] === '\n') {
+            ++this.row;
+            this.col = 1;
+        } else {
+            ++this.col;
+        }
+        this.parserState(text[ii]);
+    }
+    
+    
     
 };
 Roo.rtf.Parser.prototype = {
@@ -46,22 +59,7 @@ Roo.rtf.Parser.prototype = {
     row : 1, // reportin?
     col : 1, //
 
-    parse : function (text) {
-         
-        for (var ii = 0; ii < text.length; ++ii) {
-            ++this.cpos;
-            
-            if (text[ii] === '\n') {
-                ++this.row;
-                this.col = 1;
-            } else {
-                ++this.col;
-            }
-            this.parserState(text[ii]);
-        }
-        return this.groups;
-    },
-    
+     
     push : function (el)
     {
         var m = 'cmd'+ el.type;
@@ -83,11 +81,7 @@ Roo.rtf.Parser.prototype = {
         }).join('');
         
         this.group.addContent( new Roo.rtf.Hex( hexstr ));
-                /*iconv.decode(
-                        Buffer.from(hexstr, 'hex'), this.group.get('charset'))
-                    }
-                )
-                */
+              
             
         this.hexStore.splice(0)
         
@@ -99,7 +93,13 @@ Roo.rtf.Parser.prototype = {
         if (this.group) {
             this.groupStack.push(this.group);
         }
-        this.group = new Roo.rtf.Group(this.group || this.doc); // parent..
+         // parent..
+        if (this.doc === false) {
+            this.group = this.doc = new Roo.rtf.Document();
+            return;
+            
+        }
+        this.group = new Roo.rtf.Group(this.group);
     },
     cmdignorable : function()
     {
@@ -111,10 +111,18 @@ Roo.rtf.Parser.prototype = {
         this.flushHexStore();
         this.group.addContent(new Roo.rtf.Paragraph());
     },
-    cmdgroupend : function () {
+    cmdgroupend : function ()
+    {
         this.flushHexStore();
         var endingGroup = this.group;
+        
+        
         this.group = this.groupStack.pop();
+        if (this.group) {
+            this.group.addChild(endingGroup);
+        }
+        
+        
         
         var doc = this.group || this.doc;
         //if (endingGroup instanceof FontTable) {

diff --git a/buildSDK/dependancy_ui.txt b/buildSDK/dependancy_ui.txt
index fa5e3dc..d906a5e 100644 (file)
--- a/buildSDK/dependancy_ui.txt
+++ b/buildSDK/dependancy_ui.txt
@@ -100,6 +100,7 @@ Roo.rtf.Hex
 Roo.rtf.Paragraph
 Roo.rtf.Span
 Roo.rtf.Group
+Roo.rtf.Document
 Roo.rtf.Ctrl
 Roo.rtf.Parser
 

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index b170461..02609af 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -288941,6 +288941,16 @@
     "tree_children" : [],
     "tree_parent" : []
   },
+  "Roo.rtf" : {
+    "props" : [],
+    "events" : [],
+    "methods" : [],
+    "isAbstract" : false,
+    "isBuilderTop" : false,
+    "implementations" : [],
+    "tree_children" : [],
+    "tree_parent" : []
+  },
   "Roo.state" : {
     "props" : [],
     "events" : [],

diff --git a/docs/src/Roo_HtmlEditorCore.js.html b/docs/src/Roo_HtmlEditorCore.js.html
index 899e003..9a2da9a 100644 (file)
--- a/docs/src/Roo_HtmlEditorCore.js.html
+++ b/docs/src/Roo_HtmlEditorCore.js.html
@@ -529,18 +529,44 @@
         // even pasting into a 'email version' of this widget will have to clean up that mess.
         </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">cd </span><span class="jsdoc-syntax">= (</span><span class="jsdoc-var">e.browserEvent.clipboardData </span><span class="jsdoc-syntax">|| </span><span class="jsdoc-var">window.clipboardData</span><span class="jsdoc-syntax">);
 
+        </span><span class="jsdoc-comment">// check what type of paste - if it's an image, then handle it differently.
+        </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">cd.files.length </span><span class="jsdoc-syntax">&gt; 0) {
+            </span><span class="jsdoc-comment">// pasting images?
+            </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">urlAPI </span><span class="jsdoc-syntax">= (</span><span class="jsdoc-var">window.createObjectURL </span><span class="jsdoc-syntax">&amp;&amp; </span><span class="jsdoc-var">window</span><span class="jsdoc-syntax">) ||
+                (</span><span class="jsdoc-var">window.URL </span><span class="jsdoc-syntax">&amp;&amp; </span><span class="jsdoc-var">URL.revokeObjectURL </span><span class="jsdoc-syntax">&amp;&amp; </span><span class="jsdoc-var">URL</span><span class="jsdoc-syntax">) ||
+                (</span><span class="jsdoc-var">window.webkitURL </span><span class="jsdoc-syntax">&amp;&amp; </span><span class="jsdoc-var">webkitURL</span><span class="jsdoc-syntax">);
+
+            </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">url </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">urlAPI.createObjectURL</span><span class="jsdoc-syntax">( </span><span class="jsdoc-var">cd.files</span><span class="jsdoc-syntax">[0]);
+            </span><span class="jsdoc-var">this.insertAtCursor</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'&lt;img src=&quot; + url + &quot;&gt;'</span><span class="jsdoc-syntax">);
+            </span><span class="jsdoc-keyword">return false</span><span class="jsdoc-syntax">;
+        }
+
         </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">html </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">cd.getData</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'text/html'</span><span class="jsdoc-syntax">); </span><span class="jsdoc-comment">// clipboard event
+        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">parser </span><span class="jsdoc-syntax">= </span><span class="jsdoc-keyword">new </span><span class="jsdoc-var">Roo.rtf.Parser</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">cd.getData</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'text/rtf'</span><span class="jsdoc-syntax">));
+        </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">images </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">parser.doc.getElementsByType</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'pict'</span><span class="jsdoc-syntax">);
+        </span><span class="jsdoc-var">Roo.log</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">images</span><span class="jsdoc-syntax">);
+        </span><span class="jsdoc-comment">//Roo.log(imgs);
+        // fixme..
+        </span><span class="jsdoc-var">images </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">images.filter</span><span class="jsdoc-syntax">(</span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">g</span><span class="jsdoc-syntax">) { </span><span class="jsdoc-keyword">return </span><span class="jsdoc-syntax">!</span><span class="jsdoc-var">g.path.match</span><span class="jsdoc-syntax">(/^rtf\/(head|pgdsctbl|listtable)/); }) </span><span class="jsdoc-comment">// ignore headers
+                       </span><span class="jsdoc-var">.map</span><span class="jsdoc-syntax">(</span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">g</span><span class="jsdoc-syntax">) { </span><span class="jsdoc-keyword">return </span><span class="jsdoc-var">g.toDataURL</span><span class="jsdoc-syntax">(); });
+
+
         </span><span class="jsdoc-var">html </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.cleanWordChars</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">html</span><span class="jsdoc-syntax">);
 
         </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">d </span><span class="jsdoc-syntax">= (</span><span class="jsdoc-keyword">new </span><span class="jsdoc-var">DOMParser</span><span class="jsdoc-syntax">()</span><span class="jsdoc-var">.parseFromString</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">html</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'text/html'</span><span class="jsdoc-syntax">))</span><span class="jsdoc-var">.body</span><span class="jsdoc-syntax">;
-        </span><span class="jsdoc-var">Roo.each</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">d.items</span><span class="jsdoc-syntax">, </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">item</span><span class="jsdoc-syntax">) {
-            </span><span class="jsdoc-var">Roo.log</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">item.kind</span><span class="jsdoc-syntax">);
-        });
+
+        </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">images.length </span><span class="jsdoc-syntax">&gt; 0) {
+            </span><span class="jsdoc-var">Roo.each</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">d.getElementsByTagName</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'img'</span><span class="jsdoc-syntax">), </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">img</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">i</span><span class="jsdoc-syntax">) {
+                </span><span class="jsdoc-var">img.setAttribute</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'src'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">images</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">i</span><span class="jsdoc-syntax">]);
+            });
+        }
+
+
         </span><span class="jsdoc-keyword">new </span><span class="jsdoc-var">Roo.htmleditor.FilterStyleToTag</span><span class="jsdoc-syntax">({ </span><span class="jsdoc-var">node </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">d </span><span class="jsdoc-syntax">});
         </span><span class="jsdoc-keyword">new </span><span class="jsdoc-var">Roo.htmleditor.FilterAttributes</span><span class="jsdoc-syntax">({
             </span><span class="jsdoc-var">node </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">d</span><span class="jsdoc-syntax">,
-            </span><span class="jsdoc-var">attrib_white </span><span class="jsdoc-syntax">: [</span><span class="jsdoc-string">'href'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'src'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'name'</span><span class="jsdoc-syntax">],
-            </span><span class="jsdoc-var">attrib_clean </span><span class="jsdoc-syntax">: [</span><span class="jsdoc-string">'href'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'src'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'name'</span><span class="jsdoc-syntax">]
+            </span><span class="jsdoc-var">attrib_white </span><span class="jsdoc-syntax">: [</span><span class="jsdoc-string">'href'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'src'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'name'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'align'</span><span class="jsdoc-syntax">],
+            </span><span class="jsdoc-var">attrib_clean </span><span class="jsdoc-syntax">: [</span><span class="jsdoc-string">'href'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-string">'src' </span><span class="jsdoc-syntax">]
         });
         </span><span class="jsdoc-keyword">new </span><span class="jsdoc-var">Roo.htmleditor.FilterBlack</span><span class="jsdoc-syntax">({ </span><span class="jsdoc-var">node </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">d</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">tag </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.black</span><span class="jsdoc-syntax">});
         </span><span class="jsdoc-comment">// should be fonts..

diff --git a/docs/src/Roo_htmleditor_FilterAttributes.js.html b/docs/src/Roo_htmleditor_FilterAttributes.js.html
index dd31da9..8cfde57 100644 (file)
--- a/docs/src/Roo_htmleditor_FilterAttributes.js.html
+++ b/docs/src/Roo_htmleditor_FilterAttributes.js.html
@@ -94,7 +94,11 @@
         </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v.match</span><span class="jsdoc-syntax">(/^\./) || </span><span class="jsdoc-var">v.match</span><span class="jsdoc-syntax">(/^\//)) {
             </span><span class="jsdoc-keyword">return</span><span class="jsdoc-syntax">;
         }
-        </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v.match</span><span class="jsdoc-syntax">(/^(http|https):\/\//) || </span><span class="jsdoc-var">v.match</span><span class="jsdoc-syntax">(/^mailto:/) || </span><span class="jsdoc-var">v.match</span><span class="jsdoc-syntax">(/^ftp:/)) {
+        </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v.match</span><span class="jsdoc-syntax">(/^(http|https):\/\//)
+            || </span><span class="jsdoc-var">v.match</span><span class="jsdoc-syntax">(/^mailto:/)
+            || </span><span class="jsdoc-var">v.match</span><span class="jsdoc-syntax">(/^ftp:/)
+            || </span><span class="jsdoc-var">v.match</span><span class="jsdoc-syntax">(/^data:/)
+            ) {
             </span><span class="jsdoc-keyword">return</span><span class="jsdoc-syntax">;
         }
         </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v.match</span><span class="jsdoc-syntax">(/^#/)) {

diff --git a/docs/src/Roo_htmleditor_FilterKeepChildren.js.html b/docs/src/Roo_htmleditor_FilterKeepChildren.js.html
index a683a92..0a166a6 100644 (file)
--- a/docs/src/Roo_htmleditor_FilterKeepChildren.js.html
+++ b/docs/src/Roo_htmleditor_FilterKeepChildren.js.html
@@ -22,7 +22,7 @@
     </span><span class="jsdoc-var">replaceTag </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">node</span><span class="jsdoc-syntax">)
     {
         </span><span class="jsdoc-comment">// walk children...
-        </span><span class="jsdoc-var">Roo.log</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">node</span><span class="jsdoc-syntax">);
+        //Roo.log(node);
         </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">ar </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">Array.from</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">node.childNodes</span><span class="jsdoc-syntax">);
         </span><span class="jsdoc-comment">//remove first..
         </span><span class="jsdoc-keyword">for </span><span class="jsdoc-syntax">(</span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">i </span><span class="jsdoc-syntax">= 0; </span><span class="jsdoc-var">i </span><span class="jsdoc-syntax">&lt; </span><span class="jsdoc-var">ar.length</span><span class="jsdoc-syntax">; </span><span class="jsdoc-var">i</span><span class="jsdoc-syntax">++) {

diff --git a/docs/tree.json b/docs/tree.json
index 1bdfa85..fdc685f 100644 (file)
--- a/docs/tree.json
+++ b/docs/tree.json
@@ -1485,6 +1485,11 @@
         ],
         "is_class" : false
       },
+      {
+        "name" : "Roo.rtf",
+        "cn" : [],
+        "is_class" : false
+      },
       {
         "name" : "Roo.state",
         "cn" : [

diff --git a/roojs-all.js b/roojs-all.js
index 8dedd1c..678c655 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -1890,7 +1890,8 @@ i++){if(ar[i].nodeType==1){if((typeof(this.tag)=='object'&&this.tag.indexOf(ar[i
 A.parentNode.insertBefore(ar[i],A);if(this.tag!==false){this.walk(ar[i]);}}A.parentNode.removeChild(A);return false;}});
 // Roo/htmleditor/FilterParagraph.js
 Roo.htmleditor.FilterParagraph=function(A){this.walk(A.node);};Roo.extend(Roo.htmleditor.FilterParagraph,Roo.htmleditor.Filter,{tag:'P',replaceTag:function(A){if(A.childNodes.length==1&&A.childNodes[0].nodeType==3&&A.childNodes[0].textContent.trim().length<1){A.parentNode.replaceChild(A.ownerDocument.createElement('BR'),A);
-return false;}var ar=Array.from(A.childNodes);for(var i=0;i<ar.length;i++){A.removeChild(ar[i]);A.parentNode.insertBefore(ar[i],A);}A.parentNode.insertBefore(A.ownerDocument.createElement('BR'),A);A.parentNode.removeChild(A);return false;}});
+return false;}var ar=Array.from(A.childNodes);for(var i=0;i<ar.length;i++){A.removeChild(ar[i]);A.parentNode.insertBefore(ar[i],A);}A.parentNode.insertBefore(A.ownerDocument.createElement('BR'),A);A.parentNode.insertBefore(A.ownerDocument.createElement('BR'),A);
+A.parentNode.removeChild(A);return false;}});
 // Roo/htmleditor/FilterSpan.js
 Roo.htmleditor.FilterSpan=function(A){this.walk(A.node);};Roo.extend(Roo.htmleditor.FilterSpan,Roo.htmleditor.FilterKeepChildren,{tag:'SPAN',replaceTag:function(A){if(A.attributes&&A.attributes.length>0){return true;}Roo.htmleditor.FilterKeepChildren.prototype.replaceTag.call(this,A);
 return false;}});

diff --git a/roojs-debug.js b/roojs-debug.js
index c14b1f6..a999c58 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -45360,6 +45360,7 @@ Roo.extend(Roo.htmleditor.FilterParagraph, Roo.htmleditor.Filter,
         
         // double BR.
         node.parentNode.insertBefore(node.ownerDocument.createElement('BR'), node);
+        node.parentNode.insertBefore(node.ownerDocument.createElement('BR'), node);
         node.parentNode.removeChild(node);
         
         return false;

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 39e897c..08a5654 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -21392,6 +21392,7 @@ Roo.extend(Roo.htmleditor.FilterParagraph, Roo.htmleditor.Filter,
         
         // double BR.
         node.parentNode.insertBefore(node.ownerDocument.createElement('BR'), node);
+        node.parentNode.insertBefore(node.ownerDocument.createElement('BR'), node);
         node.parentNode.removeChild(node);
         
         return false;

diff --git a/roojs-ui.js b/roojs-ui.js
index 300be30..2273c6a 100644 (file)
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -966,7 +966,8 @@ i++){if(ar[i].nodeType==1){if((typeof(this.tag)=='object'&&this.tag.indexOf(ar[i
 A.parentNode.insertBefore(ar[i],A);if(this.tag!==false){this.walk(ar[i]);}}A.parentNode.removeChild(A);return false;}});
 // Roo/htmleditor/FilterParagraph.js
 Roo.htmleditor.FilterParagraph=function(A){this.walk(A.node);};Roo.extend(Roo.htmleditor.FilterParagraph,Roo.htmleditor.Filter,{tag:'P',replaceTag:function(A){if(A.childNodes.length==1&&A.childNodes[0].nodeType==3&&A.childNodes[0].textContent.trim().length<1){A.parentNode.replaceChild(A.ownerDocument.createElement('BR'),A);
-return false;}var ar=Array.from(A.childNodes);for(var i=0;i<ar.length;i++){A.removeChild(ar[i]);A.parentNode.insertBefore(ar[i],A);}A.parentNode.insertBefore(A.ownerDocument.createElement('BR'),A);A.parentNode.removeChild(A);return false;}});
+return false;}var ar=Array.from(A.childNodes);for(var i=0;i<ar.length;i++){A.removeChild(ar[i]);A.parentNode.insertBefore(ar[i],A);}A.parentNode.insertBefore(A.ownerDocument.createElement('BR'),A);A.parentNode.insertBefore(A.ownerDocument.createElement('BR'),A);
+A.parentNode.removeChild(A);return false;}});
 // Roo/htmleditor/FilterSpan.js
 Roo.htmleditor.FilterSpan=function(A){this.walk(A.node);};Roo.extend(Roo.htmleditor.FilterSpan,Roo.htmleditor.FilterKeepChildren,{tag:'SPAN',replaceTag:function(A){if(A.attributes&&A.attributes.length>0){return true;}Roo.htmleditor.FilterKeepChildren.prototype.replaceTag.call(this,A);
 return false;}});