mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-47736_master_fix2' of git://github.com/markn86/moodle

Browse Source
This commit is contained in:
Marina Glancy 2014-10-21 15:49:10 +08:00
commit b1b66a3d12
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -850,11 +850,17 @@ EditorAutosave.prototype = {
response_json = JSON.parse(o.responseText);
// Revert untouched editor contents to an empty string.
// Check for FF and Chrome.
if (response_json.result === '<p></p>' || response_json.result === '<p><br></p>' ||
response_json.result === '<br>') {
response_json.result = '';
}
// Check for IE 9 and 10.
if (response_json.result === '<p>&nbsp;</p>' || response_json.result === '<p><br>&nbsp;</p>') {
response_json.result = '';
}
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);

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

File diff suppressed because one or more lines are too long

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

@ -845,11 +845,17 @@ EditorAutosave.prototype = {
response_json = JSON.parse(o.responseText);
// Revert untouched editor contents to an empty string.
// Check for FF and Chrome.
if (response_json.result === '<p></p>' || response_json.result === '<p><br></p>' ||
response_json.result === '<br>') {
response_json.result = '';
}
// Check for IE 9 and 10.
if (response_json.result === '<p>&nbsp;</p>' || response_json.result === '<p><br>&nbsp;</p>') {
response_json.result = '';
}
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.result !== this.textarea.get('value')) {

6
lib/editor/atto/yui/src/editor/js/autosave.js vendored
View File

@ -146,11 +146,17 @@ EditorAutosave.prototype = {
response_json = JSON.parse(o.responseText);
// Revert untouched editor contents to an empty string.
// Check for FF and Chrome.
if (response_json.result === '<p></p>' || response_json.result === '<p><br></p>' ||
response_json.result === '<br>') {
response_json.result = '';
}
// Check for IE 9 and 10.
if (response_json.result === '<p>&nbsp;</p>' || response_json.result === '<p><br>&nbsp;</p>') {
response_json.result = '';
}
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);