Changeset 3795

Timestamp:

05/02/09 09:10:03 (3 years ago)

Author:

MichaelTempest

Message:

Item1534: Added an "else" clause, so that the button is set inactive when the cursor is not in typewriter-text.

Also added similar logic for the "text colour" button, since it is managed in the same way as the "typewriter text" button".

Location:

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons

Files:

• editor_plugin.js (modified) (1 diff)
• editor_plugin_src.js (modified) (1 diff)

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin.js

@@ -8 +8 @@
 m.selectByIndex(0);ed.fw_lb=m;return m;}
 return null;},_nodeChange:function(ed,cm,n,co){if(n==null)
-return;if(co){cm.setDisabled('tt',true);cm.setDisabled('colour',true);}else{cm.setDisabled('tt',false);cm.setDisabled('colour',false);cm.setActive('tt',false);cm.setActive('colour',false);}
+return;if(co){cm.setDisabled('tt',true);cm.setDisabled('colour',true);}else{cm.setDisabled('tt',false);cm.setDisabled('colour',false);}
 var elm=ed.dom.getParent(n,'span.WYSIWYG_TT');if(elm!=null)
-cm.setActive('tt',true);if(ed.fw_lb){var puck=-1;var nn=n.nodeName.toLowerCase();do{for(var i=0;i<ed.fw_formats.length;i++){if((!ed.fw_formats[i].el||ed.fw_formats[i].el==nn)&&(!ed.fw_formats[i].style||ed.dom.hasClass(ed.fw_formats[i].style))){puck=i;if(puck>0)
+cm.setActive('tt',true);else
+cm.setActive('tt',false);elm=ed.dom.getParent(n,'span.WYSIWYG_COLOR');if(elm!=null)
+cm.setActive('colour',true);else
+cm.setActive('colour',false);if(ed.fw_lb){var puck=-1;var nn=n.nodeName.toLowerCase();do{for(var i=0;i<ed.fw_formats.length;i++){if((!ed.fw_formats[i].el||ed.fw_formats[i].el==nn)&&(!ed.fw_formats[i].style||ed.dom.hasClass(ed.fw_formats[i].style))){puck=i;if(puck>0)
 break;}}}while(puck<0&&(n=n.parentNode)!=null);if(puck>=0){ed.fw_lb.selectByIndex(puck);}}
 return true;}});tinymce.PluginManager.add('foswikibuttons',tinymce.plugins.FoswikiButtons);})();

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin_src.js

@@ -171 +171 @@
                         cm.setDisabled('tt', false);
                         cm.setDisabled('colour', false);
-                        cm.setActive('tt', false);
-                        cm.setActive('colour', false);
                 }
             var elm = ed.dom.getParent(n, 'span.WYSIWYG_TT');
             if (elm != null)
                 cm.setActive('tt', true);
+                        else
+                cm.setActive('tt', false);
+            elm = ed.dom.getParent(n, 'span.WYSIWYG_COLOR');
+            if (elm != null)
+                cm.setActive('colour', true);
+                        else
+                cm.setActive('colour', false);
 
             if (ed.fw_lb) {