Merge branch 'MDL-47002-int-master' of git://github.com/merrill-oakla…

…nd/moodle
jfilip · Mar 25, 2015 · 54c40ff · 54c40ff
2 parents 21e864c + 665829e
commit 54c40ff
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
@@ -1329,8 +1329,8 @@ EditorClean.prototype = {
             {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: ""},
-            // Remove empty spans.
-            {regex: /<span[^>]*>(&nbsp;|\s)*<\/span>/gi, replace: ""}
+            // Remove empty spans, but not ones from Rangy.
+            {regex: /<span(?![^>]*?rangySelectionBoundary[^>]*?)[^>]*>(&nbsp;|\s)*<\/span>/gi, replace: ""}
         ];
 
         // Apply the rules.