Changeset 5872

Timestamp:

12/29/09 09:18:34 (2 years ago)

Author:

PaulHarvey

Message:

Item2447: Fix an annoyance where the selected format didn't always match what the cursor was in (would not go back to 'Normal'), so Eg. sometimes it would show the last format that you applied (Eg., Heading3) even though the cursor is in a blockquote, plain para, etc.

Location:

branches/Release01x00/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons

Files:

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

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

@@ -15 +15 @@
 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);}}
+break;}}}while(puck<0&&(n=n.parentNode)!=null);if(puck>=0){ed.fw_lb.selectByIndex(puck);}else{ed.fw_lb.selectByIndex(0);}}
 return true;}});tinymce.PluginManager.add('foswikibuttons',tinymce.plugins.FoswikiButtons);})();

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

@@ -233 +233 @@
                 if (puck >= 0) {
                     ed.fw_lb.selectByIndex(puck);
+                } else {
+                    // A region has been selected that doesn't match any known
+                    // foswiki formats, so select the first format in our list 
+                    // ('Normal').
+                    ed.fw_lb.selectByIndex(0);
                 }
             }