Roo/bootstrap/htmleditor/ToolbarStandard.js

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

diff --git a/Roo/bootstrap/htmleditor/ToolbarStandard.js b/Roo/bootstrap/htmleditor/ToolbarStandard.js
index a2c0652..e6d1e01 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';
        
@@ -82,10 +82,11 @@ Roo.extend(Roo.bootstrap.htmleditor.ToolbarStandard, Roo.bootstrap.NavSimplebar,
                 size : 'sm',
                 xtype: 'Button',
                 xns: Roo.bootstrap,
-                glyphicon : id,
+                //glyphicon : id,
+                fa: id,
                 cmd : id || cmd,
                 enableToggle:toggle !== false,
-                //html : 'submit'
+                html : html || '',
                 pressed : toggle ? false : null,
                 listeners : {}
             };
@@ -95,12 +96,14 @@ Roo.extend(Roo.bootstrap.htmleditor.ToolbarStandard, Roo.bootstrap.NavSimplebar,
             children.push(a);
             return a;
        }
+       
+    //    var cb_box = function...
         
         var style = {
                 xtype: 'Button',
                 size : 'sm',
                 xns: Roo.bootstrap,
-                glyphicon : 'font',
+                fa : 'font',
                 //html : 'submit'
                 menu : {
                     xtype: 'Menu',
@@ -124,16 +127,8 @@ Roo.extend(Roo.bootstrap.htmleditor.ToolbarStandard, Roo.bootstrap.NavSimplebar,
                 
             });
         });
-         children.push(style);   
+        children.push(style);   
         
-        Roo.log(this.editor.btns.length);
-        
-        if (this.editor.btns.length > 0) {
-            for (var i = 0; i<this.editor.btns.length; i++) {
-                Roo.log(this.editor.btns[i].glyphicon);
-            }
-        }
-            
         btn('bold',false,true);
         btn('italic',false,true);
         btn('align-left', 'justifyleft',true);
@@ -151,6 +146,13 @@ Roo.extend(Roo.bootstrap.htmleditor.ToolbarStandard, Roo.bootstrap.NavSimplebar,
                 Roo.log(this);
                 this.toggleSourceEdit(btn.pressed);
         });
+        
+        if (this.editor.btns.length > 0) {
+            for (var i = 0; i<this.editor.btns.length; i++) {
+                children.push(this.editor.btns[i]);
+            }
+        }
+        
         /*
         var cog = {
                 xtype: 'Button',