Merge pull request #1418 from MITx/feature/ichuang/conditional-xmodule-fix-display

fix bug in conditional - videos were not playing, because a js function changed syntax
2013-02-04 14:14:18 -08:00
parent 2306e7c1e8 0c07f03d68
commit d7570de5d7
1 changed files with 2 additions and 2 deletions
--- a/common/lib/xmodule/xmodule/js/src/conditional/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/conditional/display.coffee
@@ -18,9 +18,9 @@ class @Conditional
  render: (content) ->
    if content
      @el.html(content)
-      XModule.loadModules('display', @el)
+      XModule.loadModules(@el)
    else
      $.postWithPrefix "#{@url}/conditional_get", (response) =>
        @el.html(response.html)
-        XModule.loadModules('display', @el)
+        XModule.loadModules(@el)