X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=Roo%2Fbootstrap%2Fform%2FHtmlEditorToolbar%2FStandard.js;h=108c25026b5ae462f9075037470b7ebc3acbabc1;hp=e28ee235e1735759b024b061e15058d65551a153;hb=248c5cdd0fe1c3012360d530f5fd34ef516a79fb;hpb=294c1708f3cd12ae21ec2af334dd2602b60ef917

diff --git a/Roo/bootstrap/form/HtmlEditorToolbar/Standard.js b/Roo/bootstrap/form/HtmlEditorToolbar/Standard.js
index e28ee235e1..108c25026b 100644
--- a/Roo/bootstrap/form/HtmlEditorToolbar/Standard.js
+++ b/Roo/bootstrap/form/HtmlEditorToolbar/Standard.js
@@ -90,6 +90,7 @@ Roo.extend(Roo.bootstrap.form.HtmlEditorToolbar.Standard, Roo.bootstrap.nav.Simp
                 //glyphicon : id,
                 btnid : id,
                 fa: id,
+                cls : 'roo-html-editor-btn-' + id,
                 cmd : cmd, // why id || cmd
                 enableToggle: toggle !== false,
                 html : html || '',
@@ -110,6 +111,7 @@ Roo.extend(Roo.bootstrap.form.HtmlEditorToolbar.Standard, Roo.bootstrap.nav.Simp
                 size : 'sm',
                 xns: Roo.bootstrap,
                 fa : 'font',
+                cls : 'roo-html-editor-font-chooser',
                 //html : 'submit'
                 menu : {
                     xtype: 'Menu',
@@ -135,8 +137,9 @@ Roo.extend(Roo.bootstrap.form.HtmlEditorToolbar.Standard, Roo.bootstrap.nav.Simp
         });
         children.push(style);   
         
-        btn('bold',         false,true);
-        btn('italic',       false,true);
+        btn('bold',         'bold',true);
+        btn('italic',       'italic',true);
+        btn('underline',     'underline',true);
         btn('align-left',   'justifyleft',true);
         btn('align-center', 'justifycenter',true);
         btn('align-right' , 'justifyright',true);
@@ -185,8 +188,7 @@ Roo.extend(Roo.bootstrap.form.HtmlEditorToolbar.Standard, Roo.bootstrap.nav.Simp
             size : 'sm',
             xtype: 'Button',
             xns: Roo.bootstrap,
-            fa: 'eraser',
-            tooltip : "Clear Formating / Delete",
+            fa: 'trash',
             listeners : {
                 click : this.onDelete.createDelegate(this)
             }
@@ -329,7 +331,7 @@ Roo.extend(Roo.bootstrap.form.HtmlEditorToolbar.Standard, Roo.bootstrap.nav.Simp
         var hasToggle  = false;
         btns.each(function(e) {
             if (e.enableToggle && e.cmd) {
-                hasToggle = hasToggle  || (['align-left', 'align-right', 'align-center'].indexOf(e.btnid) < 0 && doc.queryCommandState(e.cmd));
+                hasToggle = hasToggle  || (['align-left', 'align-right', 'align-center', 'image' , 'link', 'underline'].indexOf(e.btnid) < 0 && doc.queryCommandState(e.cmd));
                 e.setActive(doc.queryCommandState(e.cmd));
             }
         }, this);
@@ -390,6 +392,8 @@ Roo.extend(Roo.bootstrap.form.HtmlEditorToolbar.Standard, Roo.bootstrap.nav.Simp
         }
        
         btns.get('link').setActive(tn == 'A' && this.selectedNode.hasAttribute('href'));
+        btns.get('image').setActive(tn == 'IMG' || this.editorcore.enableBlocks && tn == 'FIGURE');
+        btns.get('underline').setActive(tn == 'U' || sel.closest('u') ? true : false);
         
         Roo.bootstrap.menu.Manager.hideAll();