Changeset 23120

Timestamp:

12/07/2012 11:26:25 AM (12 years ago)

Author:

nacin

Message:

Add a sane, inclusive HTML element/attribute schema to TinyMCE.

TinyMCE 3.4.x (shipped with WordPress 3.4.x) had an HTML4-based schema definition, with HTML5 elements added to it. TinyMCE 3.5.x (shipping, again coincidentally, with WordPress 3.5) allows for HTML5 schema support, which also provides for full HTML5 attribute support. The problem is its HTML5 schema excludes all HTML4 elements and attributes that were dropped in the HTML5 spec, which is unacceptable behavior.

This "duck punch" of TinyMCE's Schema.js file creates a new, sane schema. It is TinyMCE's HTML4 and HTML5 schema definitions recursively merged.

Objects are not whitelisted in either schema to allow for embed elements as child nodes, so object, param, and embed remain separately whitelisted in the WordPress TinyMCE plugin. Our attempts to add other attributes in said plugin is now superceded.

props koopersmith, azaozz.
fixes #22790.

Location:

trunk/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• js/tinymce/plugins/wordpress/editor_plugin_src.js (modified) (1 diff)
• js/tinymce/wp-tinymce-schema.js (modified) (3 diffs)
• js/tinymce/wp-tinymce.php (modified) (1 diff)

trunk/wp-includes/class-wp-editor.php

@@ -570 +570 @@
 
         if ( $tmce_on ) {
-            if ( $compressed )
+            if ( $compressed ) {
                 echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce.php?c=1&amp;$version'></script>\n";
-            else
+            } else {
                 echo "<script type='text/javascript' src='{$baseurl}/tiny_mce.js?$version'></script>\n";
+                echo "<script type='text/javascript' src='{$baseurl}/wp-tinymce-schema.js?$version'></script>\n";
+            }
 
             if ( 'en' != self::$mce_locale && isset($lang) )

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

@@ -136 +136 @@
             });
 
-            // Add obsolete HTML attributes that are still in use.
+            // Extend <object> and <embed> (#WP22790)
             ed.onPreInit.add(function(ed) {
-                // The commonAttr are from TinyMCE 3.5.7 getHTML5()
-                // Obsolete attributes are from TinyMCE 3.5.7 getHTML4()
-                var commonAttr = 'id|accesskey|class|dir|draggable|item|hidden|itemprop|role|spellcheck|style|subject|title|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup',
-                    tdAttr = commonAttr + '|abbr|axis|headers|scope|rowspan|colspan|char|charoff|align|valign|halign|nowrap|bgcolor|width|height';
-                // Obsolete table attributes
-                ed.schema.addValidElements('table['+commonAttr+'|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor]');
-                // Obsolete tr attributes
-                ed.schema.addValidElements('tr['+commonAttr+'|align|char|charoff|valign|halign|bgcolor]');
-                // Obsolete td and th attributes
-                ed.schema.addValidElements('td['+tdAttr+'],th['+tdAttr+']');
-                // Adds "name" for <a>
-                ed.schema.addValidElements('a['+commonAttr+'|href|target|ping|rel|media|type|name]');
-                // Extend <object> and <embed>
                 ed.schema.addValidElements('object[*],param[id|name|value|valuetype|type],embed[*]');
                 ed.schema.addValidChildren('object[*]');

trunk/wp-includes/js/tinymce/wp-tinymce-schema.js

@@ -1 +1 @@
 /**
- * Schema.js
+ * TinyMCE Schema.js
+ *
+ * Duck-punched by WordPress core to support a sane schema superset.
  *
  * Copyright, Moxiecode Systems AB
@@ -321 +323 @@
 
     /**
+     * WordPress Core
+     *
+     * Returns a schema that is the result of a deep merge between the HTML5
+     * and HTML4 schemas.
+     */
+    function getSaneSchema() {
+        var cachedMapCache = mapCache,
+            html5, html4;
+
+        if ( mapCache.sane )
+            return mapCache.sane;
+
+        // Bust the mapCache so we're not dealing with the other schema objects.
+        mapCache = {};
+        html5 = getHTML5();
+        html4 = getHTML4();
+        mapCache = cachedMapCache;
+
+        each( html4, function( html4settings, tag ) {
+            var html5settings = html5[ tag ],
+                difference = [];
+
+            // Merge tags missing in HTML5 mode.
+            if ( ! html5settings ) {
+                html5[ tag ] = html4settings;
+                return;
+            }
+
+            // Merge attributes missing from this HTML5 tag.
+            each( html4settings.attributes, function( attribute, key ) {
+                if ( ! html5settings.attributes[ key ] )
+                    html5settings.attributes[ key ] = attribute;
+            });
+
+            // Merge any missing attributes into the attributes order.
+            each( html4settings.attributesOrder, function( key ) {
+                if ( -1 === tinymce.inArray( html5settings.attributesOrder, key ) )
+                    difference.push( key );
+            });
+
+            html5settings.attributesOrder = html5settings.attributesOrder.concat( difference );
+
+            // Merge children missing from this HTML5 tag.
+            each( html4settings.children, function( child, key ) {
+                if ( ! html5settings.children[ key ] )
+                    html5settings.children[ key ] = child;
+            });
+        });
+
+        return mapCache.sane = html5;
+    }
+
+    /**
      * Schema validator class.
      *
@@ -369 +424 @@
 
         settings = settings || {};
-        schemaItems = settings.schema == "html5" ? getHTML5() : getHTML4();
+
+        /**
+         * WordPress core uses a sane schema in place of the default "HTML5" schema.
+         */
+        schemaItems = settings.schema == "html5" ? getSaneSchema() : getHTML4();
 
         // Allow all elements and attributes if verify_html is set to false

trunk/wp-includes/js/tinymce/wp-tinymce.php

@@ -34 +34 @@
 } else {
     echo get_file($basepath . '/tiny_mce.js');
+    echo get_file($basepath . '/wp-tinymce-schema.js');
 }
 exit;