Merge branch 'MDL-41328-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

2013-09-02 11:44:58 +08:00
parent 0bd9f000b7 dacc2f8847
commit 581a1695ac
1 changed files with 7 additions and 0 deletions
@@ -68,6 +68,13 @@ M.editor_tinymce.init_editor = function(Y, editorid, options) {
                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();
+                });
            });
        };
    }