Commit e92a39cf authored by Dan Poltawski's avatar Dan Poltawski
Browse files

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

This reverts commit 61a0465c, reversing
changes made to 2408f8fe.
parent 27cec472
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,6 +210,11 @@ Y.extend(Editor, Y.Base, { ...@@ -210,6 +210,11 @@ Y.extend(Editor, Y.Base, {
// Disable odd inline CSS styles. // Disable odd inline CSS styles.
this.disableCssStyling(); this.disableCssStyling();
// Use paragraphs not divs.
if (document.queryCommandSupported('DefaultParagraphSeparator')) {
document.execCommand('DefaultParagraphSeparator', false, 'p');
}
// Add the toolbar and editable zone to the page. // Add the toolbar and editable zone to the page.
this.textarea.get('parentNode').insert(this._wrapper, this.textarea). this.textarea.get('parentNode').insert(this._wrapper, this.textarea).
setAttribute('class', 'editor_atto_wrap'); setAttribute('class', 'editor_atto_wrap');
...@@ -291,10 +296,6 @@ Y.extend(Editor, Y.Base, { ...@@ -291,10 +296,6 @@ Y.extend(Editor, Y.Base, {
* @chainable * @chainable
*/ */
setupAutomaticPolling: function() { 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(['keyup', 'cut'], this.updateOriginal, this));
this._registerEventHandle(this.editor.on('paste', this.pasteCleanup, this)); this._registerEventHandle(this.editor.on('paste', this.pasteCleanup, this));
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
"overlay", "overlay",
"escape", "escape",
"event", "event",
"event-key",
"event-simulate", "event-simulate",
"event-custom", "event-custom",
"node-event-html5", "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