Changeset 3963

Timestamp:

05/23/09 12:45:31 (3 years ago)

Author:

MichaelTempest

Message:

Item1341, Item1534: Revert changes to see if this was what broke save-from-wikitext on trunk

Location:

trunk/TinyMCEPlugin

Files:

• data/System/TinyMCEPlugin.txt (modified) (1 diff)
• lib/Foswiki/Plugins/TinyMCEPlugin.pm (modified) (1 diff)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin.js (modified) (1 diff)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikibuttons/editor_plugin_src.js (modified) (1 diff)

trunk/TinyMCEPlugin/data/System/TinyMCEPlugin.txt

@@ -51 +51 @@
 remove_script_host : false,
 dialog_type: "modal",
-extended_valid_elements : "li[type]",
 setupcontent_callback : FoswikiTiny.setUpContent,
 urlconverter_callback : "FoswikiTiny.convertLink",

trunk/TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm

@@ -36 +36 @@
 remove_script_host : false,
 dialog_type: "modal",
-extended_valid_elements : "li[type]",
 setupcontent_callback : FoswikiTiny.setUpContent,
 urlconverter_callback : "FoswikiTiny.convertLink",

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

@@ -9 +9 @@
 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);}
-var elm=ed.dom.getParent(n,'.WYSIWYG_TT');if(elm!=null)
+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,'.WYSIWYG_COLOR');if(elm!=null)
+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)

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

@@ -172 +172 @@
                         cm.setDisabled('colour', false);
                 }
-            var elm = ed.dom.getParent(n, '.WYSIWYG_TT');
+            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, '.WYSIWYG_COLOR');
+            elm = ed.dom.getParent(n, 'span.WYSIWYG_COLOR');
             if (elm != null)
                 cm.setActive('colour', true);