moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Marina Glancy 2014-10-21 14:34:05 +08:00
commit fb32a64efc
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js vendored
View file

@ -850,7 +850,8 @@ EditorAutosave.prototype = {
response_json = JSON.parse(o.responseText); response_json = JSON.parse(o.responseText);
// Revert untouched editor contents to an empty string. // Revert untouched editor contents to an empty string.
if (response_json.result === '<p></p>' || response_json.result === '<p><br></p>') { if (response_json.result === '<p></p>' || response_json.result === '<p><br></p>' ||
response_json.result === '<br>') {
response_json.result = ''; response_json.result = '';
} }

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

3
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js vendored
View file

@ -845,7 +845,8 @@ EditorAutosave.prototype = {
response_json = JSON.parse(o.responseText); response_json = JSON.parse(o.responseText);
// Revert untouched editor contents to an empty string. // Revert untouched editor contents to an empty string.
if (response_json.result === '<p></p>' || response_json.result === '<p><br></p>') { if (response_json.result === '<p></p>' || response_json.result === '<p><br></p>' ||
response_json.result === '<br>') {
response_json.result = ''; response_json.result = '';
} }

3
lib/editor/atto/yui/src/editor/js/autosave.js vendored
View file

@ -146,7 +146,8 @@ EditorAutosave.prototype = {
response_json = JSON.parse(o.responseText); response_json = JSON.parse(o.responseText);
// Revert untouched editor contents to an empty string. // Revert untouched editor contents to an empty string.
if (response_json.result === '<p></p>' || response_json.result === '<p><br></p>') { if (response_json.result === '<p></p>' || response_json.result === '<p><br></p>' ||
response_json.result === '<br>') {
response_json.result = ''; response_json.result = '';
} }