Merge pull request #75 from edx/hotfix/2016-03-17

Revert "Make Capa problems do initial load without AJAX."

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):

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)

lms/templates/problem_ajax.html

-<div id="problem_${element_id}" class="problems-wrapper" data-problem-id="${id}" data-url="${ajax_url}" data-progress_status="${progress_status}" data-progress_detail="${progress_detail}" data-content="${content | h}"></div>
+<div id="problem_${element_id}" class="problems-wrapper" data-problem-id="${id}" data-url="${ajax_url}" data-progress_status="${progress_status}" data-progress_detail="${progress_detail}"></div>