L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-47733-master' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2014-10-17 11:44:58 +01:00
parent bef6e88b5d 5aafc6f425
commit 9b4a87f7e6
4 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
Vendored
+5 -7
View File
@@ -846,16 +846,14 @@ EditorAutosave.prototype = {
context: this,
on: {
success: function(id,o) {
if (typeof o.responseText !== "undefined" &&
o.responseText !== "" &&
o.responseText !== this.textarea.get('value')) {
if (typeof o.responseText !== "undefined" && o.responseText !== "") {
response_json = JSON.parse(o.responseText);
if (!response_json.error && response_json.result) {
Y.log('Autosave text found - recover it.', 'debug', LOGNAME_AUTOSAVE);
this.recoverText(response_json.result);
} else {
if (response_json.error || typeof response_json.result === 'undefined') {
Y.log('Error occurred recovering draft text: ' + response_json.error, 'debug', LOGNAME_AUTOSAVE);
this.showMessage(M.util.get_string('errortextrecovery', 'editor_atto'), NOTIFY_WARNING, RECOVER_MESSAGE_TIMEOUT);
} else if (response_json !== this.textarea.get('value')) {
Y.log('Autosave text found - recover it.', 'debug', LOGNAME_AUTOSAVE);
this.recoverText(response_json.result);
}
this._fireSelectionChanged();
}
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
Vendored
+4 -6
View File
@@ -841,14 +841,12 @@ EditorAutosave.prototype = {
context: this,
on: {
success: function(id,o) {
if (typeof o.responseText !== "undefined" &&
o.responseText !== "" &&
o.responseText !== this.textarea.get('value')) {
if (typeof o.responseText !== "undefined" && o.responseText !== "") {
response_json = JSON.parse(o.responseText);
if (!response_json.error && response_json.result) {
this.recoverText(response_json.result);
} else {
if (response_json.error || typeof response_json.result === 'undefined') {
this.showMessage(M.util.get_string('errortextrecovery', 'editor_atto'), NOTIFY_WARNING, RECOVER_MESSAGE_TIMEOUT);
} else if (response_json !== this.textarea.get('value')) {
this.recoverText(response_json.result);
}
this._fireSelectionChanged();
}
lib/editor/atto/yui/src/editor/js/autosave.js
Vendored
+5 -7
View File
@@ -142,16 +142,14 @@ EditorAutosave.prototype = {
context: this,
on: {
success: function(id,o) {
if (typeof o.responseText !== "undefined" &&
o.responseText !== "" &&
o.responseText !== this.textarea.get('value')) {
if (typeof o.responseText !== "undefined" && o.responseText !== "") {
response_json = JSON.parse(o.responseText);
if (!response_json.error && response_json.result) {
Y.log('Autosave text found - recover it.', 'debug', LOGNAME_AUTOSAVE);
this.recoverText(response_json.result);
} else {
if (response_json.error || typeof response_json.result === 'undefined') {
Y.log('Error occurred recovering draft text: ' + response_json.error, 'debug', LOGNAME_AUTOSAVE);
this.showMessage(M.util.get_string('errortextrecovery', 'editor_atto'), NOTIFY_WARNING, RECOVER_MESSAGE_TIMEOUT);
} else if (response_json !== this.textarea.get('value')) {
Y.log('Autosave text found - recover it.', 'debug', LOGNAME_AUTOSAVE);
this.recoverText(response_json.result);
}
this._fireSelectionChanged();
}