Merge master

common/lib/xmodule/xmodule/js/src/capa/display.coffee

@@ -13,6 +13,7 @@ class @Problem
   bind: =>
     MathJax.Hub.Queue ["Typeset", MathJax.Hub]
     window.update_schematics()
+    @inputs = @$("[id^=input_#{@element_id.replace(/problem_/, '')}_]")
     @$('section.action input:button').click @refreshAnswers
     @$('section.action input.check').click @check_fd
     #@$('section.action input.check').click @check
@@ -114,8 +115,8 @@ class @Problem
       return
 
     fd = new FormData()
-
-    @$("[id^=input_#{@element_id.replace(/problem_/, '')}_]").each (index, element) ->
+    
+    @inputs.each (index, element) ->
       if element.type is 'file'
         if element.files[0] instanceof File
           fd.append(element.id, element.files[0])
@@ -206,7 +207,7 @@ class @Problem
       element.schematic.update_value()
     @$(".CodeMirror").each (index, element) ->
       element.CodeMirror.save() if element.CodeMirror.save
-    @answers = @$("[id^=input_#{@element_id.replace(/problem_/, '')}_]").serialize()
+    @answers = @inputs.serialize()
 
   inputtypeSetupMethods:
     javascriptinput: (element) =>

common/lib/xmodule/xmodule/x_module.py

@@ -643,8 +643,7 @@ class ModuleSystem(object):
                  user=None,
                  filestore=None,
                  debug=False,
-                 xqueue_callback_url=None,
-                 xqueue_default_queuename="null",
+                 xqueue = None,
                  is_staff=False):
         '''
         Create a closure around the system environment.
@@ -668,6 +667,9 @@ class ModuleSystem(object):
         filestore - A filestore ojbect.  Defaults to an instance of OSFS based
                          at settings.DATA_DIR.
 
+        xqueue - Dict containing XqueueInterface object, as well as parameters 
+                    for the specific StudentModule
+
         replace_urls - TEMPORARY - A function like static_replace.replace_urls
                          that capa_module can use to fix up the static urls in
                          ajax results.
@@ -676,8 +678,7 @@ class ModuleSystem(object):
              TODO (vshnayder): this will need to change once we have real user roles.
         '''
         self.ajax_url = ajax_url
-        self.xqueue_callback_url = xqueue_callback_url
-        self.xqueue_default_queuename = xqueue_default_queuename
+        self.xqueue = xqueue
         self.track_function = track_function
         self.filestore = filestore
         self.get_module = get_module