From f8dcce1fb8dcce7a4eeebf070b3ba3b66f9bca27 Mon Sep 17 00:00:00 2001 From: Po Tsui Date: Thu, 3 Aug 2017 14:09:16 -0700 Subject: [PATCH 1/3] Move cached data from body to seq_content Previously, some future update or rogue script could easily tamper with our cached data attributes on the body element. We moved these data attributes to be slightly less widely accessible. --- .../static/js/submit_and_compare_view.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/submit_and_compare/static/js/submit_and_compare_view.js b/submit_and_compare/static/js/submit_and_compare_view.js index ee1674f..2f69cf0 100644 --- a/submit_and_compare/static/js/submit_and_compare_view.js +++ b/submit_and_compare/static/js/submit_and_compare_view.js @@ -6,6 +6,7 @@ function SubmitAndCompareXBlockInitView(runtime, element) { var publishUrl = runtime.handlerUrl(element, 'publish_event'); var $element = $(element); + var $xblocksContainer = $('#seq_content'); var submit_button = $element.find('.submit_button'); var hint_button = $element.find('hint_button'); @@ -30,10 +31,10 @@ function SubmitAndCompareXBlockInitView(runtime, element) { var cached_answer_id = xblock_id + '_cached_answer'; var problem_progress_id = xblock_id + '_problem_progress'; var used_attempts_feedback_id = xblock_id + '_used_attempts_feedback'; - if ($('body').data(cached_answer_id) !== undefined) { - answer_textarea.text($('body').data(cached_answer_id)); - problem_progress.text($('body').data(problem_progress_id)); - used_attempts_feedback.text($('body').data(used_attempts_feedback_id)); + if ($xblocksContainer.data(cached_answer_id) !== undefined) { + answer_textarea.text($xblocksContainer.data(cached_answer_id)); + problem_progress.text($xblocksContainer.data(problem_progress_id)); + used_attempts_feedback.text($xblocksContainer.data(used_attempts_feedback_id)); } $.ajax({ @@ -56,9 +57,9 @@ function SubmitAndCompareXBlockInitView(runtime, element) { } function post_submit(result) { - $('body').data(cached_answer_id, $('.answer',element).val()); - $('body').data(problem_progress_id, result.problem_progress); - $('body').data(used_attempts_feedback_id, result.used_attempts_feedback); + $xblocksContainer.data(cached_answer_id, $('.answer',element).val()); + $xblocksContainer.data(problem_progress_id, result.problem_progress); + $xblocksContainer.data(used_attempts_feedback_id, result.used_attempts_feedback); problem_progress.text(result.problem_progress); button_holder.addClass(result.submit_class); used_attempts_feedback.text(result.used_attempts_feedback); From 4fc9c1b10a642a10b6242665d214593808ed0c29 Mon Sep 17 00:00:00 2001 From: Po Tsui Date: Fri, 4 Aug 2017 11:09:49 -0700 Subject: [PATCH 2/3] Fix indentation --- submit_and_compare/static/js/submit_and_compare_view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/submit_and_compare/static/js/submit_and_compare_view.js b/submit_and_compare/static/js/submit_and_compare_view.js index 2f69cf0..95a08f1 100644 --- a/submit_and_compare/static/js/submit_and_compare_view.js +++ b/submit_and_compare/static/js/submit_and_compare_view.js @@ -3,9 +3,9 @@ function SubmitAndCompareXBlockInitView(runtime, element) { var handlerUrl = runtime.handlerUrl(element, 'student_submit'); var hintUrl = runtime.handlerUrl(element, 'send_hints'); - var publishUrl = runtime.handlerUrl(element, 'publish_event'); + var publishUrl = runtime.handlerUrl(element, 'publish_event'); - var $element = $(element); + var $element = $(element); var $xblocksContainer = $('#seq_content'); var submit_button = $element.find('.submit_button'); From 1a1f1bc6e53945e198142958c4dfc31ee9d1215f Mon Sep 17 00:00:00 2001 From: Po Tsui Date: Fri, 4 Aug 2017 11:29:56 -0700 Subject: [PATCH 3/3] Update to version 0.5.2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c3b7a14..f1f16bc 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ def run_tests(self): setup( name='xblock-submit-and-compare', - version='0.5.1', + version='0.5.2', description='Submit and Compare XBlock for self assessment', packages=[ 'submit_and_compare',