Merge branch 'MDL-44798-master' of git://github.com/andrewnicols/moodle

lib/editor/atto/readme_moodle.txt

@@ -0,0 +1,10 @@
+Description of the import of libraries associated with the Atto editor.
+
+1)  Rangy (version 1.2.3)
+    * Download the latest stable release;
+    * Copy the content of the 'currentrelease/uncompressed' folder into yui/src/rangy/js
+    * Run shifter against yui/src/rangy
+
+    Notes:
+    * We have patched 1.2.3 with a backport fix from the next release of Rangy which addresses an incompatibility
+      between Rangy and HTML5Shiv which is used in the bootstrapclean theme. See MDL-44798 for further information.

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

@@ -1937,6 +1937,11 @@ rangy.createModule("DomUtil", function(api, module) {
         }
 
         var workingNode = dom.getDocument(containerElement).createElement("span");
+        // Workaround for HTML5 Shiv's insane violation of document.createElement(). See Rangy issue 104 and HTML5
+        // Shiv issue 64: https://github.com/aFarkas/html5shiv/issues/64
+        if (workingNode.parentNode) {
+            workingNode.parentNode.removeChild(workingNode);
+        }
         var comparison, workingComparisonType = isStart ? "StartToStart" : "StartToEnd";
         var previousNode, nextNode, boundaryPosition, boundaryNode;
 

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

@@ -1937,6 +1937,11 @@ rangy.createModule("DomUtil", function(api, module) {
         }
 
         var workingNode = dom.getDocument(containerElement).createElement("span");
+        // Workaround for HTML5 Shiv's insane violation of document.createElement(). See Rangy issue 104 and HTML5
+        // Shiv issue 64: https://github.com/aFarkas/html5shiv/issues/64
+        if (workingNode.parentNode) {
+            workingNode.parentNode.removeChild(workingNode);
+        }
         var comparison, workingComparisonType = isStart ? "StartToStart" : "StartToEnd";
         var previousNode, nextNode, boundaryPosition, boundaryNode;
 

lib/editor/atto/yui/src/rangy/js/rangy-core.js

@@ -1937,6 +1937,11 @@ rangy.createModule("DomUtil", function(api, module) {
         }
 
         var workingNode = dom.getDocument(containerElement).createElement("span");
+        // Workaround for HTML5 Shiv's insane violation of document.createElement(). See Rangy issue 104 and HTML5
+        // Shiv issue 64: https://github.com/aFarkas/html5shiv/issues/64
+        if (workingNode.parentNode) {
+            workingNode.parentNode.removeChild(workingNode);
+        }
         var comparison, workingComparisonType = isStart ? "StartToStart" : "StartToEnd";
         var previousNode, nextNode, boundaryPosition, boundaryNode;