Permalink
Browse files

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

…29/moodle"

This reverts commit 61a0465, reversing
changes made to 2408f8f.
  • Loading branch information...
danpoltawski committed Apr 13, 2016
1 parent 27cec47 commit e92a39cf0ce1b5bfeee40df2382587bd04cd19ce
@@ -212,6 +212,11 @@ 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');
@@ -293,10 +298,6 @@ 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));
@@ -2597,7 +2598,6 @@ Y.Base.mix(Y.M.editor_atto.Editor, [EditorFilepicker]);
"overlay",
"escape",
"event",
"event-key",
"event-simulate",
"event-custom",
"node-event-html5",
Oops, something went wrong.

0 comments on commit e92a39c

Please sign in to comment.