Ticket #22790: 22790-2.patch

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

@@ -135 +135 @@
                                 }
                         });
 
-                        // Add obsolete HTML attributes that are still in use.
+                        // Add obsolete HTML elements and attributes that are still in use.
                         ed.onPreInit.add(function(ed) {
-                                // The commonAttr are from TinyMCE 3.5.7 getHTML5()
-                                // Obsolete attributes are from TinyMCE 3.5.7 getHTML4()
+                                // Tags and attributes from TinyMCE 3.5.8 getHTML4() and getHTML5()
                                 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[*]');
+                                        tdAttr = commonAttr + '|abbr|axis|headers|scope|rowspan|colspan|char|charoff|align|valign|halign|nowrap|bgcolor|width|height',
+                                        html4Attr = 'id|class|style|title|lang|xml:lang|dir|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup';
+
+                                ed.schema.addValidElements(
+                                        // HTML 4.0 tags that are obsolete in HTML 5.0
+                                        'applet[id|class|style|title|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace],' +
+                                        'tt['+html4Attr+'],' +
+                                        'u['+html4Attr+'],' +
+                                        's['+html4Attr+'],' +
+                                        'strike['+html4Attr+'],' +
+                                        'big['+html4Attr+'],' +
+                                        'font[id|class|style|title|lang|xml:lang|dir|size|color|face],' +
+                                        'basefont[id|size|color|face],' +
+                                        'acronym['+html4Attr+'],' +
+                                        'dir['+html4Attr+'|compact],' +
+                                        'center['+html4Attr+'],' +
+                                        'noframes['+html4Attr+'],' +
+                                        'isindex[id|class|style|title|lang|xml:lang|dir|prompt],' +
+
+                                        // HTML 4.0 attributes that are obsolete in HTML 5.0
+                                        'table['+commonAttr+'|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor],' +
+                                        'thead['+commonAttr+'|align|char|charoff|valign],' +
+                                        'tfoot['+commonAttr+'|align|char|charoff|valign],' +
+                                        'tbody['+commonAttr+'|align|char|charoff|valign],' +
+                                        'tr['+commonAttr+'|align|char|charoff|valign|halign|bgcolor],' +
+                                        'td['+tdAttr+'],' +
+                                        'th['+tdAttr+'],' +
+                                        'p['+commonAttr+'|align],' +
+                                        'a['+commonAttr+'|href|target|ping|rel|media|type' + '|tabindex|onfocus|onblur|charset|name|hreflang|rev|shape|coords],' +
+                                        'br['+commonAttr+'|clear],' +
+                                        'h1['+commonAttr+'|align],' +
+                                        'h2['+commonAttr+'|align],' +
+                                        'h3['+commonAttr+'|align],' +
+                                        'h4['+commonAttr+'|align],' +
+                                        'h5['+commonAttr+'|align],' +
+                                        'h6['+commonAttr+'|align],' +
+                                        'img['+commonAttr+'|alt|src|height|width|usemap|ismap' + '|name|longdesc|align|border|hspace|vspace],' +
+                                        'iframe['+commonAttr+'|name|src|height|width|sandbox|seamless' + '|longdesc|frameborder|marginwidth|marginheight|scrolling|align],' +
+                                        'input['+commonAttr+'|type|accept|alt|autocomplete|autofocus|checked|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|height|list|max|maxlength|min|' +
+                                                'multiple|pattern|placeholder|readonly|required|size|src|step|width|files|value|name' + '|tabindex|onfocus|onblur|usemap|onselect|onchange|align],' +
+                                        'select['+commonAttr+'|autofocus|disabled|form|multiple|name|size' + '|tabindex|onfocus|onblur|onchange],' +
+                                        'textarea['+commonAttr+'|autofocus|disabled|form|maxlength|name|placeholder|readonly|required|rows|cols|wrap' + '|tabindex|onfocus|onblur|onselect|onchange],' +
+                                        'label['+commonAttr+'|form|for' + '|onfocus|onblur],' +
+                                        'button['+commonAttr+'|autofocus|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|name|value|type' + '|tabindex|onfocus|onblur],' +
+                                        'div['+commonAttr+'|align],' +
+                                        'ul['+commonAttr+'|type|compact],' +
+                                        'ol['+commonAttr+'|start|reversed' + '|type|compact],' +
+                                        'li['+commonAttr+'|value' + '|type],' +
+                                        'dl['+commonAttr+'|compact],' +
+                                        'menu['+commonAttr+'|type|label' + '|compact],' +
+                                        'pre['+commonAttr+'|width|xml:space],' +
+                                        'hr['+commonAttr+'|align|noshade|size|width],' +
+                                        'legend['+commonAttr+'|align],' +
+                                        'caption['+commonAttr+'|align],' +
+                                        'col['+commonAttr+'|span' + '|width|align|char|charoff|valign],' +
+                                        'colgroup['+commonAttr+'|span' + '|width|align|char|charoff|valign],' +
+                                        'form['+commonAttr+'|accept-charset|action|autocomplete|enctype|method|name|novalidate|target' + '|onsubmit|onreset|accept],' +
+                                        'area['+commonAttr+'|shape|coords|href|alt|target|media|rel|ping|type' + '|tabindex|onfocus|onblur|nohref],' +
+                                        'body['+commonAttr+'|onload|onunload|background|bgcolor|text|link|vlink|alink],' +
+
+                                        // Extended <object> and <embed>
+                                        'object[*],' +
+                                        'param[id|name|value|valuetype|type],' +
+                                        'embed[*]'
+                                );
+
                                 ed.schema.addValidChildren('object[*]');
                         });