Merge branch 'MDL-46088_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

2014-09-15 11:32:29 +08:00
parent 9a45421093 cb81111118
commit 574b53efde
1 changed files with 4 additions and 0 deletions
@@ -256,6 +256,10 @@ M.mod_quiz.secure_window = {
            // Left click on a button or similar. No worries.
            return;
        }
+        if (e.button == 1 && e.target.test('[contenteditable=true]')) {
+            // Left click in Atto or similar.
+            return;
+        }
        e.halt();
    },