From dc37223bff8940886359440f971b10b8472c3be5 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Tue, 16 Sep 2014 08:49:45 +0100 Subject: [PATCH] MDL-46088 quiz secure window: further Atto JS fixes. --- mod/quiz/module.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/mod/quiz/module.js b/mod/quiz/module.js index 2d2ddf2b7c9..eea385475a5 100644 --- a/mod/quiz/module.js +++ b/mod/quiz/module.js @@ -246,12 +246,17 @@ M.mod_quiz.secure_window = { setTimeout(M.mod_quiz.secure_window.clear_status, 10); }, - /** - * Prevent the selection event without showing an alert. - * - * @method prevent_selection - * @param {EventFacade} e - */ + is_content_editable: function(n) { + if (n.test('[contenteditable=true]')) { + return true; + } + n = n.get('parentNode'); + if (n === null) { + return false; + } + return M.mod_quiz.is_content_editable(n); + }, + prevent_selection: function(e) { return false; }, @@ -266,7 +271,7 @@ M.mod_quiz.secure_window = { // Left click on a button or similar. No worries. return; } - if (e.button == 1 && e.target.test('[contenteditable=true]')) { + if (e.button == 1 && M.mod_quiz.is_content_editable(e.target)) { // Left click in Atto or similar. return; }