sync

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

diff --git a/Roo/bootstrap/htmleditor/ToolbarStandard.js b/Roo/bootstrap/htmleditor/ToolbarStandard.js
index 3c65fd1..5fc83d7 100644 (file)
--- a/Roo/bootstrap/htmleditor/ToolbarStandard.js
+++ b/Roo/bootstrap/htmleditor/ToolbarStandard.js
@@ -4,6 +4,7 @@ Roo.namespace('Roo.bootstrap.htmleditor');
  * @class Roo.bootstrap.HtmlEditorToolbar1
  * Basic Toolbar
  * 
+ * @example
  * Usage:
  *
  new Roo.bootstrap.HtmlEditor({
@@ -74,7 +75,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 +83,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 : {}
             };
@@ -102,7 +104,7 @@ Roo.extend(Roo.bootstrap.htmleditor.ToolbarStandard, Roo.bootstrap.NavSimplebar,
                 xtype: 'Button',
                 size : 'sm',
                 xns: Roo.bootstrap,
-                glyphicon : 'font',
+                fa : 'font',
                 //html : 'submit'
                 menu : {
                     xtype: 'Menu',
@@ -126,7 +128,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,9 +150,10 @@ 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]);
             }
         }
+        
         /*
         var cog = {
                 xtype: 'Button',
@@ -243,7 +246,7 @@ Roo.extend(Roo.bootstrap.htmleditor.ToolbarStandard, Roo.bootstrap.NavSimplebar,
         // hides menus... - so this cant be on a menu...
         Roo.bootstrap.MenuMgr.hideAll();
         */
-        Roo.bootstrap.MenuMgr.hideAll();
+        Roo.bootstrap.menu.Manager.hideAll();
         //this.editorsyncValue();
     },
     onFirstFocus: function() {