X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-ui-debug.js;h=ab5d2908d9e451fc291cc2dd0af6b08e69ecfc62;hb=refs%2Fheads%2Fwip_alan_T6962_html_editor_update_to_new;hp=d570ba0f4056f089092edb754fc2bdb0663de836;hpb=463eb66e118bd45cc7ca899fbeb1d38ad3d0d4a1;p=roojs1

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index d570ba0f40..ab5d2908d9 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -7934,7 +7934,11 @@ Roo.extend(Roo.PagingToolbar, Roo.Toolbar, {
             this.loading.disable();
         }
     },
-
+    /**
+     * event that occurs when you click on the navigation buttons - can be used to trigger load of a grid.
+     * @param {String} which (first|prev|next|last|refresh)  which button to press.
+     *
+     */
     // private
     onClick : function(which){
         var ds = this.ds;
@@ -22348,7 +22352,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',
@@ -23644,6 +23648,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',
@@ -23679,7 +23685,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
                         }
                     ]
                     
@@ -25548,7 +25554,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);
@@ -26655,7 +26662,7 @@ Roo.extend(Roo.form.HtmlEditor, Roo.form.Field, {
      */
     autoClean: true,
     /**
-     * @cfg {string} bodyCls- default '' default classes to add to body of editable area - usually undoreset is a good start..
+     * @cfg {string} bodyCls default '' default classes to add to body of editable area - usually undoreset is a good start..
      */
     bodyCls : '',
     /**
@@ -36129,6 +36136,17 @@ layout.addxtype({
     }
 });
 
+
+
+
+
+
+
+
+
+
+
+
 /**
  * @class Roo.GridPanel
  * @extends Roo.ContentPanel
@@ -36212,7 +36230,7 @@ Roo.extend(Roo.GridPanel, Roo.ContentPanel, {
  * @class Roo.NestedLayoutPanel
  * @extends Roo.ContentPanel
  * @parent Roo.BorderLayout Roo.LayoutDialog builder
- * @cfg Roo.BorderLayout} layout   [required] The layout for this panel
+ * @cfg {Roo.BorderLayout} layout   [required] The layout for this panel
  *
  * 
  * @constructor
@@ -36251,6 +36269,8 @@ Roo.NestedLayoutPanel = function(layout, config)
 
 Roo.extend(Roo.NestedLayoutPanel, Roo.ContentPanel, {
 
+    layout : false,
+
     setSize : function(width, height){
         if(!this.ignoreResize(width, height)){
             var size = this.adjustForComponents(width, height);
@@ -36301,7 +36321,7 @@ Roo.extend(Roo.NestedLayoutPanel, Roo.ContentPanel, {
     
     /**
      * Returns the nested BorderLayout for this panel
-     * @return {Roo.BorderLayout} 
+     * @return {Roo.BorderLayout}
      */
     getLayout : function(){
         return this.layout;
@@ -36458,17 +36478,6 @@ Roo.extend(Roo.TreePanel, Roo.ContentPanel, {
     tree : false
 
 });
-
-
-
-
-
-
-
-
-
-
-
 /*
  * Based on:
  * Ext JS Library 1.1.1