Changeset 6547

Timestamp:

01/04/2008 08:49:35 AM (18 years ago)

Author:

ryan

Message:

Don't bust table markup when switching between visual and html. Props mdawaffe. fixes #5577

Location:

trunk/wp-includes

Files:

• js/tinymce/plugins/wordpress/editor_plugin.js (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

@@ -245 +245 @@
                 // Handle table badness.
                 content = content.replace(new RegExp('<(table( [^>]*)?)>.*?<((tr|thead)( [^>]*)?)>', 'mg'), '<$1><$3>');
-                content = content.replace(new RegExp('<(tr|thead|tfoot)>.*?<((td|th)( [^>]*)?)>', 'mg'), '<$1><$2>');
+                content = content.replace(new RegExp('<((?:tr|thead|tfoot)(?: [^>]*)?)>.*?<((td|th)( [^>]*)?)>', 'mg'), '<$1><$2>');
                 content = content.replace(new RegExp('</(td|th)>.*?<(td( [^>]*)?|th( [^>]*)?|/tr|/thead|/tfoot)>', 'mg'), '</$1><$2>');
-                content = content.replace(new RegExp('</tr>.*?<(tr|/table)>', 'mg'), '</tr><$1>');
+                content = content.replace(new RegExp('</tr>.*?<(tr( [^>]*)?|/table)>', 'mg'), '</tr><$1>');
                 content = content.replace(new RegExp('<(/?(table|tbody|tr|th|td)[^>]*)>(\\s*|(<br ?/?>)*)*', 'g'), '<$1>');
 

trunk/wp-includes/script-loader.php

@@ -31 +31 @@
         $this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' );
 
-        $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20070528' );
+        // Modify this version when tinyMCE plugins are changed
+        $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20080103' );
+
         $mce_config = apply_filters('tiny_mce_config_url', '/wp-includes/js/tinymce/tiny_mce_config.php');
         $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20070528' );