From b8b7327e93ae5e40a90d430641f4b08d7c518f1a Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Thu, 17 Mar 2016 14:26:04 -0400 Subject: [PATCH] Revert "Make Capa problems do initial load without AJAX." This reverts commit 9984bbc29ab6b7092b787ba5cf35580dd4a58cec. --- common/lib/xmodule/xmodule/capa_base.py | 1 - common/lib/xmodule/xmodule/js/src/capa/display.coffee | 3 +-- lms/templates/problem_ajax.html | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/lib/xmodule/xmodule/capa_base.py b/common/lib/xmodule/xmodule/capa_base.py index 0eb1241de9..64e9729c2a 100644 --- a/common/lib/xmodule/xmodule/capa_base.py +++ b/common/lib/xmodule/xmodule/capa_base.py @@ -399,7 +399,6 @@ class CapaMixin(CapaFields): 'ajax_url': self.runtime.ajax_url, 'progress_status': Progress.to_js_status_str(progress), 'progress_detail': Progress.to_js_detail_str(progress), - 'content': self.get_problem_html(encapsulate=False) }) def check_button_name(self): diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.coffee b/common/lib/xmodule/xmodule/js/src/capa/display.coffee index a057a9dfd8..d9d1b89c77 100644 --- a/common/lib/xmodule/xmodule/js/src/capa/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/capa/display.coffee @@ -5,7 +5,6 @@ class @Problem @id = @el.data('problem-id') @element_id = @el.attr('id') @url = @el.data('url') - @content = @el.data('content') # has_timed_out and has_response are used to ensure that are used to # ensure that we wait a minimum of ~ 1s before transitioning the check @@ -13,7 +12,7 @@ class @Problem @has_timed_out = false @has_response = false - @render(@content) + @render() $: (selector) -> $(selector, @el) diff --git a/lms/templates/problem_ajax.html b/lms/templates/problem_ajax.html index 664b7567c0..05c3c2ada8 100644 --- a/lms/templates/problem_ajax.html +++ b/lms/templates/problem_ajax.html @@ -1 +1 @@ -
+