commit

[roojs1] / Roo / bootstrap / htmleditor / ToolbarStandard.js

diff --git a/Roo/bootstrap/htmleditor/ToolbarStandard.js b/Roo/bootstrap/htmleditor/ToolbarStandard.js
index 89fdb17..75cd237 100644 (file)
--- a/Roo/bootstrap/htmleditor/ToolbarStandard.js
+++ b/Roo/bootstrap/htmleditor/ToolbarStandard.js
@@ -74,7 +74,7 @@ Roo.extend(Roo.bootstrap.htmleditor.ToolbarStandard, Roo.bootstrap.NavSimplebar,
        var editor= this.editor;
        
        var children = [];
-       var btn = function(id,cmd , toggle, handler){
+       var btn = function(id,cmd , toggle, handler, html){
        
             var  event = toggle ? 'toggle' : 'click';
        
@@ -85,7 +85,7 @@ Roo.extend(Roo.bootstrap.htmleditor.ToolbarStandard, Roo.bootstrap.NavSimplebar,
                 glyphicon : id,
                 cmd : id || cmd,
                 enableToggle:toggle !== false,
-                //html : 'submit'
+                html : html || '',
                 pressed : toggle ? false : null,
                 listeners : {}
             };
@@ -126,7 +126,7 @@ Roo.extend(Roo.bootstrap.htmleditor.ToolbarStandard, Roo.bootstrap.NavSimplebar,
                 
             });
         });
-         children.push(style);   
+        children.push(style);   
         
         btn('bold',false,true);
         btn('italic',false,true);
@@ -148,7 +148,7 @@ Roo.extend(Roo.bootstrap.htmleditor.ToolbarStandard, Roo.bootstrap.NavSimplebar,
         
         if (this.editor.btns.length > 0) {
             for (var i = 0; i<this.editor.btns.length; i++) {
-                btn(this.editor.btns[i].glyphicon,false,true,this.editor.btns[i].listeners.click);
+                children.push(this.editor.btns[i]);
             }
         }