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

This commit is contained in:
Dan Poltawski
2016-01-25 10:26:00 +00:00
4 changed files with 29 additions and 14 deletions
@@ -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;
},
File diff suppressed because one or more lines are too long
@@ -1939,10 +1939,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;
},
+9 -4
View File
@@ -97,10 +97,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;
},