From 339554aa21a2b689550b1dac4ad12d03fbaa322a Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Sat, 6 Sep 2014 18:17:46 +0100 Subject: [PATCH 1/3] MDL-46088 Impossible to click on Atto in a Quiz in 'Secure' mode. --- mod/quiz/module.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mod/quiz/module.js b/mod/quiz/module.js index 7931e2bd288..120203d74c4 100644 --- a/mod/quiz/module.js +++ b/mod/quiz/module.js @@ -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(); }, From d250083e039f2269f318a47bcb54d7eb0b67fcac Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Tue, 16 Sep 2014 10:41:54 +0800 Subject: [PATCH 2/3] MDL-46088 Quiz: Prevent alert when clicking in editor in secure popup --- mod/quiz/module.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mod/quiz/module.js b/mod/quiz/module.js index 120203d74c4..2d2ddf2b7c9 100644 --- a/mod/quiz/module.js +++ b/mod/quiz/module.js @@ -222,7 +222,7 @@ M.mod_quiz.secure_window = { Y.delegate('mousedown', M.mod_quiz.secure_window.prevent_mouse, 'body', '*'); Y.delegate('mouseup', M.mod_quiz.secure_window.prevent_mouse, 'body', '*'); Y.delegate('dragstart', M.mod_quiz.secure_window.prevent, document, '*'); - Y.delegate('selectstart', M.mod_quiz.secure_window.prevent, document, '*'); + Y.delegate('selectstart', M.mod_quiz.secure_window.prevent_selection, document, '*'); Y.delegate('cut', M.mod_quiz.secure_window.prevent, document, '*'); Y.delegate('copy', M.mod_quiz.secure_window.prevent, document, '*'); Y.delegate('paste', M.mod_quiz.secure_window.prevent, document, '*'); @@ -246,6 +246,16 @@ 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 + */ + prevent_selection: function(e) { + return false; + }, + prevent: function(e) { alert(M.str.quiz.functiondisabledbysecuremode); e.halt(); From dc37223bff8940886359440f971b10b8472c3be5 Mon Sep 17 00:00:00 2001 From: Tim Hunt Date: Tue, 16 Sep 2014 08:49:45 +0100 Subject: [PATCH 3/3] 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; }