Merge branch 'MDL-52825_29' of git://github.com/dmonllao/moodle into …

…MOODLE_29_STABLE
moodle · Jan 25, 2016 · 95dd0ad · 95dd0ad
2 parents 117e9a6 + 2c5bd27
commit 95dd0ad
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 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
@@ -1952,10 +1952,15 @@ EditorSelection.prototype = {
         // To capture both mouseup and touchend events, we need to track the gesturemoveend event in standAlone mode. Without
         // standAlone, it will only fire if we listened to a gesturemovestart too.
         this.editor.on('gesturemoveend', function(e) {
-                Y.soon(Y.bind(this._hasSelectionChanged, this, e));
-            }, {
-                standAlone: true
-            }, this);
+
+            // Ignore the event if the target is not part of the current editor.
+            if (!this._wrapper.contains(e.target._node)) {
+                return;
+            }
+            Y.soon(Y.bind(this._hasSelectionChanged, this, e));
+        }, {
+            standAlone: true
+        }, this);
 
         return this;
     },