add "A" to inline elements for html serializer

[roojs1] / roojs-debug.js

diff --git a/roojs-debug.js b/roojs-debug.js
index c60ac85..ac7e4ce 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -46817,7 +46817,7 @@ Roo.htmleditor.TidyWriter.prototype = {
 
 Roo.htmleditor.TidyWriter.inline_elements = [
         'SPAN','STRONG','B','EM','I','FONT','STRIKE','U','VAR',
-        'CITE','DFN','CODE','MARK','Q','SUP','SUB','SAMP'
+        'CITE','DFN','CODE','MARK','Q','SUP','SUB','SAMP', 'A'
 ];
 Roo.htmleditor.TidyWriter.shortend_elements = [
     'AREA','BASE','BASEFONT','BR','COL','FRAME','HR','IMG','INPUT',
@@ -48113,6 +48113,8 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
             };
         }
         
+        var captionhtml = this.caption_display == 'hidden' ? this.caption : (this.caption.length ? this.caption : "Caption");
+        
         return  {
             tag: 'figure',
             'data-block' : 'Figure',
@@ -48148,7 +48150,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
                             // we can not rely on yahoo syndication to use CSS elements - so have to use  '<i>' to encase stuff.
                             tag : 'i',
                             contenteditable : true,
-                            html : this.caption
+                            html : captionhtml
                         }
                     ]
                     
@@ -49880,8 +49882,10 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
                 new Roo.htmleditor.FilterParagraph({node : this.doc.body}); // paragraphs
                 new Roo.htmleditor.FilterSpan({node : this.doc.body}); // empty spans
             }
+            if (this.enableBlocks) {
+                Roo.htmleditor.Block.initAll(this.doc.body);
+            }
             
-            Roo.htmleditor.Block.initAll(this.doc.body);
             this.updateLanguage();
             
             var lc = this.doc.body.lastChild;
@@ -50015,7 +50019,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
         //Roo.log(imgs);
         // fixme..
         images = images.filter(function(g) { return !g.path.match(/^rtf\/(head|pgdsctbl|listtable)/); }) // ignore headers
-                       .map(function(g) { return g.toDataURL(); });
+                       .map(function(g) { return g.toDataURL(); })
+                       .filter(function(g) { return g != 'about:blank'; });
         
         
         html = this.cleanWordChars(html);