Merge branch 'MDL-49564-master' of git://github.com/merrill-oakland/moodle

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js

@@ -1318,9 +1318,7 @@ EditorClean.prototype = {
             // Remove Apple- classes in class attributes. Only removes one or more that appear in succession.
             {regex: /(<[^>]*?class\s*?=\s*?"[^>"]*?)(?:[\s]*Apple-[_a-zA-Z0-9\-]*)+/gi, replace: "$1"},
             // Remove OLE_LINK# anchors that may litter the code.
-            {regex: /<a [^>]*?name\s*?=\s*?"OLE_LINK\d*?"[^>]*?>\s*?<\/a>/gi, replace: ""},
+            {regex: /<a [^>]*?name\s*?=\s*?"OLE_LINK\d*?"[^>]*?>\s*?<\/a>/gi, replace: ""}
-            // Remove empty spans, but not ones from Rangy.
-            {regex: /<span(?![^>]*?rangySelectionBoundary[^>]*?)[^>]*>(&nbsp;|\s)*<\/span>/gi, replace: ""}
         ];
 
         // Apply the rules.
@@ -1329,7 +1327,63 @@ EditorClean.prototype = {
         // Reapply the standard cleaner to the content.
         content = this._cleanHTML(content);
 
+        // Clean unused spans out of the content.
+        content = this._cleanSpans(content);
+
         return content;
+    },
+
+    /**
+     * Clean empty or un-unused spans from passed HTML.
+     *
+     * This code intentionally doesn't use YUI Nodes. YUI was quite a bit slower at this, so using raw DOM objects instead.
+     *
+     * @method _cleanSpans
+     * @private
+     * @param {String} content The content to clean
+     * @return {String} The cleaned HTML
+     */
+    _cleanSpans: function(content) {
+        // Return an empty string if passed an invalid or empty object.
+        if (!content || content.length === 0) {
+            return "";
+        }
+        // Check if the string is empty or only contains whitespace.
+        if (content.length === 0 || !content.match(/\S/)) {
+            return content;
+        }
+
+        var rules = [
+            // Remove unused class, style, or id attributes. This will make empty tag detection easier later.
+            {regex: /(<[^>]*?)(?:[\s]*(?:class|style|id)\s*?=\s*?"\s*?")+/gi, replace: "$1"}
+        ];
+        // Apply the rules.
+        content = this._filterContentWithRules(content, rules);
+
+        // Reference: "http://stackoverflow.com/questions/8131396/remove-nested-span-without-id"
+
+        // This is better to run detached from the DOM, so the browser doesn't try to update on each change.
+        var holder = document.createElement('div');
+        holder.innerHTML = content;
+        var spans = holder.getElementsByTagName('span');
+
+        // Since we will be removing elements from the list, we should copy it to an array, making it static.
+        var spansarr = Array.prototype.slice.call(spans, 0);
+
+        spansarr.forEach(function(span) {
+            if (!span.hasAttributes()) {
+                // If no attributes (id, class, style, etc), this span is has no effect.
+                // Move each child (if they exist) to the parent in place of this span.
+                while (span.firstChild) {
+                    span.parentNode.insertBefore(span.firstChild, span);
+                }
+
+                // Remove the now empty span.
+                span.parentNode.removeChild(span);
+            }
+        });
+
+        return holder.innerHTML;
     }
 };
 

lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js

@@ -1307,9 +1307,7 @@ EditorClean.prototype = {
             // Remove Apple- classes in class attributes. Only removes one or more that appear in succession.
             {regex: /(<[^>]*?class\s*?=\s*?"[^>"]*?)(?:[\s]*Apple-[_a-zA-Z0-9\-]*)+/gi, replace: "$1"},
             // Remove OLE_LINK# anchors that may litter the code.
-            {regex: /<a [^>]*?name\s*?=\s*?"OLE_LINK\d*?"[^>]*?>\s*?<\/a>/gi, replace: ""},
+            {regex: /<a [^>]*?name\s*?=\s*?"OLE_LINK\d*?"[^>]*?>\s*?<\/a>/gi, replace: ""}
-            // Remove empty spans, but not ones from Rangy.
-            {regex: /<span(?![^>]*?rangySelectionBoundary[^>]*?)[^>]*>(&nbsp;|\s)*<\/span>/gi, replace: ""}
         ];
 
         // Apply the rules.
@@ -1318,7 +1316,63 @@ EditorClean.prototype = {
         // Reapply the standard cleaner to the content.
         content = this._cleanHTML(content);
 
+        // Clean unused spans out of the content.
+        content = this._cleanSpans(content);
+
         return content;
+    },
+
+    /**
+     * Clean empty or un-unused spans from passed HTML.
+     *
+     * This code intentionally doesn't use YUI Nodes. YUI was quite a bit slower at this, so using raw DOM objects instead.
+     *
+     * @method _cleanSpans
+     * @private
+     * @param {String} content The content to clean
+     * @return {String} The cleaned HTML
+     */
+    _cleanSpans: function(content) {
+        // Return an empty string if passed an invalid or empty object.
+        if (!content || content.length === 0) {
+            return "";
+        }
+        // Check if the string is empty or only contains whitespace.
+        if (content.length === 0 || !content.match(/\S/)) {
+            return content;
+        }
+
+        var rules = [
+            // Remove unused class, style, or id attributes. This will make empty tag detection easier later.
+            {regex: /(<[^>]*?)(?:[\s]*(?:class|style|id)\s*?=\s*?"\s*?")+/gi, replace: "$1"}
+        ];
+        // Apply the rules.
+        content = this._filterContentWithRules(content, rules);
+
+        // Reference: "http://stackoverflow.com/questions/8131396/remove-nested-span-without-id"
+
+        // This is better to run detached from the DOM, so the browser doesn't try to update on each change.
+        var holder = document.createElement('div');
+        holder.innerHTML = content;
+        var spans = holder.getElementsByTagName('span');
+
+        // Since we will be removing elements from the list, we should copy it to an array, making it static.
+        var spansarr = Array.prototype.slice.call(spans, 0);
+
+        spansarr.forEach(function(span) {
+            if (!span.hasAttributes()) {
+                // If no attributes (id, class, style, etc), this span is has no effect.
+                // Move each child (if they exist) to the parent in place of this span.
+                while (span.firstChild) {
+                    span.parentNode.insertBefore(span.firstChild, span);
+                }
+
+                // Remove the now empty span.
+                span.parentNode.removeChild(span);
+            }
+        });
+
+        return holder.innerHTML;
     }
 };
 

lib/editor/atto/yui/src/editor/js/clean.js

@@ -293,9 +293,7 @@ EditorClean.prototype = {
             // Remove Apple- classes in class attributes. Only removes one or more that appear in succession.
             {regex: /(<[^>]*?class\s*?=\s*?"[^>"]*?)(?:[\s]*Apple-[_a-zA-Z0-9\-]*)+/gi, replace: "$1"},
             // Remove OLE_LINK# anchors that may litter the code.
-            {regex: /<a [^>]*?name\s*?=\s*?"OLE_LINK\d*?"[^>]*?>\s*?<\/a>/gi, replace: ""},
+            {regex: /<a [^>]*?name\s*?=\s*?"OLE_LINK\d*?"[^>]*?>\s*?<\/a>/gi, replace: ""}
-            // Remove empty spans, but not ones from Rangy.
-            {regex: /<span(?![^>]*?rangySelectionBoundary[^>]*?)[^>]*>(&nbsp;|\s)*<\/span>/gi, replace: ""}
         ];
 
         // Apply the rules.
@@ -304,7 +302,63 @@ EditorClean.prototype = {
         // Reapply the standard cleaner to the content.
         content = this._cleanHTML(content);
 
+        // Clean unused spans out of the content.
+        content = this._cleanSpans(content);
+
         return content;
+    },
+
+    /**
+     * Clean empty or un-unused spans from passed HTML.
+     *
+     * This code intentionally doesn't use YUI Nodes. YUI was quite a bit slower at this, so using raw DOM objects instead.
+     *
+     * @method _cleanSpans
+     * @private
+     * @param {String} content The content to clean
+     * @return {String} The cleaned HTML
+     */
+    _cleanSpans: function(content) {
+        // Return an empty string if passed an invalid or empty object.
+        if (!content || content.length === 0) {
+            return "";
+        }
+        // Check if the string is empty or only contains whitespace.
+        if (content.length === 0 || !content.match(/\S/)) {
+            return content;
+        }
+
+        var rules = [
+            // Remove unused class, style, or id attributes. This will make empty tag detection easier later.
+            {regex: /(<[^>]*?)(?:[\s]*(?:class|style|id)\s*?=\s*?"\s*?")+/gi, replace: "$1"}
+        ];
+        // Apply the rules.
+        content = this._filterContentWithRules(content, rules);
+
+        // Reference: "http://stackoverflow.com/questions/8131396/remove-nested-span-without-id"
+
+        // This is better to run detached from the DOM, so the browser doesn't try to update on each change.
+        var holder = document.createElement('div');
+        holder.innerHTML = content;
+        var spans = holder.getElementsByTagName('span');
+
+        // Since we will be removing elements from the list, we should copy it to an array, making it static.
+        var spansarr = Array.prototype.slice.call(spans, 0);
+
+        spansarr.forEach(function(span) {
+            if (!span.hasAttributes()) {
+                // If no attributes (id, class, style, etc), this span is has no effect.
+                // Move each child (if they exist) to the parent in place of this span.
+                while (span.firstChild) {
+                    span.parentNode.insertBefore(span.firstChild, span);
+                }
+
+                // Remove the now empty span.
+                span.parentNode.removeChild(span);
+            }
+        });
+
+        return holder.innerHTML;
     }
 };