Merge branch 'MDL-62738_35' of https://github.com/mfabriczy/moodle in…

…to MOODLE_35_STABLE
moodle · Oct 9, 2018 · 5f13e88 · 5f13e88
2 parents a16f2c8 + 975c91d
commit 5f13e88
Showing 1 changed file with 0 additions and 22 deletions.
diff --git a/lib/editor/tinymce/module.js b/lib/editor/tinymce/module.js
@@ -59,28 +59,6 @@ M.editor_tinymce.init_editor = function(Y, editorid, options) {
         }
     }
 
-    // We have to override the editor setup to work around a bug in iOS browsers - MDL-36803.
-    if (Y.UA.ios) {
-        // Retain any setup which is already defined.
-        options.originalSetupFunction = options.setup || function(){};
-        options.setup = function(editor) {
-            options.originalSetupFunction();
-            editor.onPostRender.add(function(ed) {
-                // Whenever there is a keydown event, ensure that the contentWindow still have focus.
-                ed.contentDocument.addEventListener('keydown', function() {
-                    ed.contentWindow.focus();
-                });
-
-                // Whenever a touch event is registered against the content document,
-                // reapply focus. This works around an issue with the location caret not
-                // being focusable without use of the Loupe.
-                ed.contentDocument.addEventListener('touchend', function() {
-                    ed.contentWindow.focus();
-                });
-            });
-        };
-    }
-
     // Retain any setup which is already defined.
     options.originalSetupFunction = options.setup || function(){};
     options.setup = function(editor) {