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

This reverts commit 61a0465c, reversing
changes made to 2408f8fe.

lib/editor/atto/yui/src/editor/js/editor.js

@@ -210,6 +210,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');
@@ -291,10 +296,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));
 

lib/editor/atto/yui/src/editor/meta/editor.json

@@ -7,7 +7,6 @@
             "overlay",
             "escape",
             "event",
-            "event-key",
             "event-simulate",
             "event-custom",
             "node-event-html5",