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

Merge branch 'MDL-49693-28' of git://github.com/merrill-oakland/moodle into MOODLE_28_STABLE

Browse Source 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
This commit is contained in:
Andrew Nicols
2015-04-01 12:37:37 +08:00
parent 16008dfd92 93e80c9b45
commit cd32489d7a
4 changed files with 13 additions and 16 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
+4 -5
View File
@@ -674,16 +674,15 @@ EditorTextArea.prototype = {
// Clear it first.
this.editor.setHTML('');
// Copy text to editable div.
this.editor.append(this.textarea.get('value'));
// Clean it.
this.cleanEditorHTML();
// Copy cleaned HTML to editable div.
this.editor.append(this._cleanHTML(this.textarea.get('value')));
// Insert a paragraph in the empty contenteditable div.
if (this.editor.getHTML() === '') {
this.editor.setHTML(this._getEmptyContent());
}
return this;
},
/**
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Vendored
+1 -1
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 -5
View File
@@ -669,16 +669,15 @@ EditorTextArea.prototype = {
// Clear it first.
this.editor.setHTML('');
// Copy text to editable div.
this.editor.append(this.textarea.get('value'));
// Clean it.
this.cleanEditorHTML();
// Copy cleaned HTML to editable div.
this.editor.append(this._cleanHTML(this.textarea.get('value')));
// Insert a paragraph in the empty contenteditable div.
if (this.editor.getHTML() === '') {
this.editor.setHTML(this._getEmptyContent());
}
return this;
},
/**
lib/editor/atto/yui/src/editor/js/textarea.js
Vendored
+4 -5
View File
@@ -64,16 +64,15 @@ EditorTextArea.prototype = {
// Clear it first.
this.editor.setHTML('');
// Copy text to editable div.
this.editor.append(this.textarea.get('value'));
// Clean it.
this.cleanEditorHTML();
// Copy cleaned HTML to editable div.
this.editor.append(this._cleanHTML(this.textarea.get('value')));
// Insert a paragraph in the empty contenteditable div.
if (this.editor.getHTML() === '') {
this.editor.setHTML(this._getEmptyContent());
}
return this;
},
/**