MDL-57374 editor: Pasting plain text in Atto removes all styles/classes

moodle · Jan 12, 2017 · 7c51958 · 7c51958
1 parent 5e1014a
commit 7c51958
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 18 deletions.
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
@@ -1395,9 +1395,9 @@ EditorClean.prototype = {
                     isHTML = (types.indexOf('text/html') > -1);
                 }
 
+                var content;
                 if (isHTML) {
                     // Get the clipboard content.
-                    var content;
                     try {
                         content = event.clipboardData.getData('text/html');
                     } catch (error) {
@@ -1427,10 +1427,16 @@ EditorClean.prototype = {
                     this.updateOriginal();
                     return false;
                 } else {
-                    // Due to poor cross browser clipboard compatibility, the failure to find html doesn't mean it isn't there.
-                    // Wait for the clipboard event to finish then fallback clean the entire editor.
-                    this.fallbackPasteCleanupDelayed();
-                    return true;
+                    try {
+                        // Plaintext clipboard content can only be retrieved this way.
+                        content = event.clipboardData.getData('text');
+                    } catch (error) {
+                        // Something went wrong. Fallback.
+                        // Due to poor cross browser clipboard compatibility, the failure to find html doesn't mean it isn't there.
+                        // Wait for the clipboard event to finish then fallback clean the entire editor.
+                        this.fallbackPasteCleanupDelayed();
+                        return true;
+                    }
                 }
             } else {
                 // If we reached a here, this probably means the browser has limited (or no) clipboard support.