Commit 61a0465c authored by Dan Poltawski's avatar Dan Poltawski
Browse files

Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle

parents 2408f8fe a6a59bca
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
......@@ -210,11 +210,6 @@ Y.extend(Editor, Y.Base, {
// Disable odd inline CSS styles.
this.disableCssStyling();
// Use paragraphs not divs.
if (document.queryCommandSupported('DefaultParagraphSeparator')) {
document.execCommand('DefaultParagraphSeparator', false, 'p');
}
// Add the toolbar and editable zone to the page.
this.textarea.get('parentNode').insert(this._wrapper, this.textarea).
setAttribute('class', 'editor_atto_wrap');
......@@ -296,6 +291,10 @@ Y.extend(Editor, Y.Base, {
* @chainable
*/
setupAutomaticPolling: function() {
// Force use of <p> tags when pressing enter key
this._registerEventHandle(this.editor.on('key', function() {
document.execCommand('formatBlock', false, 'p');
}, 'press:enter', this));
this._registerEventHandle(this.editor.on(['keyup', 'cut'], this.updateOriginal, this));
this._registerEventHandle(this.editor.on('paste', this.pasteCleanup, this));
......
......@@ -7,6 +7,7 @@
"overlay",
"escape",
"event",
"event-key",
"event-simulate",
"event-custom",
"node-event-html5",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment