mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 16:40:07 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-44810-master' of git://github.com/jethac/moodle

Browse Source 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
This commit is contained in:
Dan Poltawski 2014-04-08 12:04:41 +08:00
commit 9a59ebaa6c
5 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-debug.js vendored
View File

@ -96,6 +96,11 @@ Y.extend(EditorPlugin, Y.Base, {
* @method markUpdated
*/
markUpdated: function() {
// Save selection after changes to the DOM. If you don't do this here,
// subsequent calls to restoreSelection() will fail expecting the
// previous DOM state.
this.get('host').saveSelection();
return this.get('host').updateOriginal();
}
}, {
@ -747,6 +752,9 @@ EditorPluginButtons.prototype = {
// Build the arguments list, but remove the callback we're calling.
var args = [e, callbackArgs];
// Restore selection before making changes.
this.get('host').restoreSelection();
// Actually call the callback now.
return callback.apply(this, args);
},

4
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js vendored
View File

File diff suppressed because one or more lines are too long

8
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin.js vendored
View File

@ -96,6 +96,11 @@ Y.extend(EditorPlugin, Y.Base, {
* @method markUpdated
*/
markUpdated: function() {
// Save selection after changes to the DOM. If you don't do this here,
// subsequent calls to restoreSelection() will fail expecting the
// previous DOM state.
this.get('host').saveSelection();
return this.get('host').updateOriginal();
}
}, {
@ -745,6 +750,9 @@ EditorPluginButtons.prototype = {
// Build the arguments list, but remove the callback we're calling.
var args = [e, callbackArgs];
// Restore selection before making changes.
this.get('host').restoreSelection();
// Actually call the callback now.
return callback.apply(this, args);
},

3
lib/editor/atto/yui/src/editor/js/editor-plugin-buttons.js vendored
View File

@ -604,6 +604,9 @@ EditorPluginButtons.prototype = {
// Build the arguments list, but remove the callback we're calling.
var args = [e, callbackArgs];
// Restore selection before making changes.
this.get('host').restoreSelection();
// Actually call the callback now.
return callback.apply(this, args);
},

5
lib/editor/atto/yui/src/editor/js/editor-plugin.js vendored
View File

@ -94,6 +94,11 @@ Y.extend(EditorPlugin, Y.Base, {
* @method markUpdated
*/
markUpdated: function() {
// Save selection after changes to the DOM. If you don't do this here,
// subsequent calls to restoreSelection() will fail expecting the
// previous DOM state.
this.get('host').saveSelection();
return this.get('host').updateOriginal();
}
}, {