Ticket #25903: wp-tinymce-scheme.varcleenup.diff

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

@@ -386 +386 @@
          * @param {Object} settings Name/value settings object.
          */
         tinymce.html.Schema = function(settings) {
-                var self = this, elements = {}, children = {}, patternElements = [], validStyles, schemaItems;
-                var whiteSpaceElementsMap, selfClosingElementsMap, shortEndedElementsMap, boolAttrMap, blockElementsMap, nonEmptyElementsMap, customElementsMap = {};
+                var self = this, elements = {}, children = {}, patternElements = [], validStyles, schemaItems,
+                        whiteSpaceElementsMap, selfClosingElementsMap, shortEndedElementsMap, boolAttrMap, blockElementsMap,
+                        textBlockElementsMap, nonEmptyElementsMap, customElementsMap = {};
 
                 // Creates an lookup table map object for the specified option or the default value
                 function createLookupTable(option, default_value, extend) {
@@ -451 +452 @@
                 // Parses the specified valid_elements string and adds to the current rules
                 // This function is a bit hard to read since it's heavily optimized for speed
                 function addValidElements(valid_elements) {
-                        var ei, el, ai, al, yl, matches, element, attr, attrData, elementName, attrName, attrType, attributes, attributesOrder,
-                                prefix, outputName, globalAttributes, globalAttributesOrder, transElement, key, childKey, value,
+                        var ei, el, ai, al, matches, element, attr, attrData, elementName, attrName, attrType, attributes, attributesOrder,
+                                prefix, outputName, globalAttributes, globalAttributesOrder, key, value,
                                 elementRuleRegExp = /^([#+\-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,
                                 attrRuleRegExp = /^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,
                                 hasPatternsRegExp = /[*?+]/;
@@ -626 +627 @@
                                         }
 
                                         // Add custom elements at span/div positions
-                                        each(children, function(element, child) {
+                                        each(children, function(element) {
                                                 if (element[cloneName])
                                                         element[name] = element[cloneName];
                                         });