X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-ui-debug.js;h=b317fe95026ce079ee541c1e210ce661378c2df1;hb=e6d9cd3b3b2ea94cbc5346c1b89138553350de3c;hp=8d28b32d3640edeabe203cd174390dd610ef7b76;hpb=0a63fb76507fcd1468a87100feb288338db14739;p=roojs1

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 8d28b32d36..b317fe9502 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -23648,8 +23648,8 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
                 ]
             };
         }
-        
-        var captionhtml = this.caption_display == 'hidden' ? this.caption : (this.caption.length ? this.caption : "Caption");
+        // we remove caption totally if its hidden... - will delete data.. but otherwise we end up with fake caption
+        var captionhtml = this.caption_display == 'hidden' ? '' : (this.caption.length ? this.caption : "Caption");
         
         return  {
             tag: 'figure',
@@ -23673,7 +23673,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
               
                 {
                     tag: 'figcaption',
-                    
+                    'data-display' : this.caption_display,
                     style : {
                         'text-align': 'left',
                         'margin-top' : '16px',
@@ -23713,7 +23713,7 @@ Roo.extend(Roo.htmleditor.BlockFigure, Roo.htmleditor.Block, {
         if (this.caption.trim().match(/^<i[^>]*>/i)) {
             this.caption = this.caption.trim().replace(/^<i[^>]*>/i, '').replace(/^<\/i>$/i, '');
         }
-        this.caption_display = this.getVal(node, 'figcaption', 'style', 'display');
+        this.caption_display = this.getVal(node, 'figcaption', 'data-display');
         //this.text_align = this.getVal(node, 'figcaption', 'style','text-align');
         this.width = this.getVal(node, 'figure', 'style', 'max-width');
         //this.margin = this.getVal(node, 'figure', 'style', 'margin');
@@ -25557,7 +25557,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
         Roo.log(images);
         //Roo.log(imgs);
         // fixme..
-        images = images.filter(function(g) { return !g.path.match(/^rtf\/(head|pgdsctbl|listtable)/); }) // ignore headers
+        images = images.filter(function(g) { return !g.path.match(/^rtf\/(head|pgdsctbl|listtable|footerf)/); }) // ignore headers/footers etc.
                        .map(function(g) { return g.toDataURL(); })
                        .filter(function(g) { return g != 'about:blank'; });