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

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
parent a6396272f8 3c15d25bcf
commit fb32a64efc
4 changed files with 8 additions and 5 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
+2 -1
View File
@@ -850,7 +850,8 @@ EditorAutosave.prototype = {
response_json = JSON.parse(o.responseText);
// 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 = '';
}
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
+2 -1
View File
@@ -845,7 +845,8 @@ EditorAutosave.prototype = {
response_json = JSON.parse(o.responseText);
// 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 = '';
}
lib/editor/atto/yui/src/editor/js/autosave.js
Vendored
+2 -1
View File
@@ -146,7 +146,8 @@ EditorAutosave.prototype = {
response_json = JSON.parse(o.responseText);
// 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 = '';
}