X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=docs%2Fsrc%2FRoo_bootstrap_form_HtmlEditorToolbar_Standard.js.html;h=1f235d8b55b0b00ba467038a228a65ec1d8d5543;hb=4ffff0b75e1e2e8e4a75820e2ee3712a4bfd3e2e;hp=13316b80a239c22f0f25d654451c6599b9a098b0;hpb=a9d9e421ffd6fcb659ec250ab17f548c93fd04b9;p=roojs1
diff --git a/docs/src/Roo_bootstrap_form_HtmlEditorToolbar_Standard.js.html b/docs/src/Roo_bootstrap_form_HtmlEditorToolbar_Standard.js.html
index 13316b80a2..1f235d8b55 100644
--- a/docs/src/Roo_bootstrap_form_HtmlEditorToolbar_Standard.js.html
+++ b/docs/src/Roo_bootstrap_form_HtmlEditorToolbar_Standard.js.html
@@ -135,8 +135,14 @@
});
children.push(style);
+<<<<<<< Updated upstream
btn('bold', false,true);
btn('italic', false,true);
+=======
+ btn('bold', 'bold',true);
+ btn('italic', 'italic',true);
+ btn('underline', 'underline',true);
+>>>>>>> Stashed changes
btn('align-left', 'justifyleft',true);
btn('align-center', 'justifycenter',true);
btn('align-right' , 'justifyright',true);
@@ -185,7 +191,8 @@
size : 'sm',
xtype: 'Button',
xns: Roo.bootstrap,
- fa: 'trash',
+ fa: 'eraser',
+ tooltip : "Clear Formating / Delete",
listeners : {
click : this.onDelete.createDelegate(this)
}
@@ -328,7 +335,11 @@
var hasToggle = false;
btns.each(function(e) {
if (e.enableToggle && e.cmd) {
+<<<<<<< Updated upstream
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));
+>>>>>>> Stashed changes
e.setActive(doc.queryCommandState(e.cmd));
}
}, this);
@@ -389,6 +400,11 @@
}
btns.get('link').setActive(tn == 'A' && this.selectedNode.hasAttribute('href'));
+<<<<<<< Updated upstream
+=======
+ btns.get('image').setActive(tn == 'IMG' || this.editorcore.enableBlocks && tn == 'FIGURE');
+ btns.get('underline').setActive(tn == 'U' || sel.closest('u') ? true : false);
+>>>>>>> Stashed changes
Roo.bootstrap.menu.Manager.hideAll();