Convert javascript_loader to JS.

Also reformat to 4 spaces per indent.
2016-10-07 10:52:21 -04:00
parent d33532702a
commit b8ddf709dc
12 changed files with 90 additions and 79 deletions
--- a/common/lib/xmodule/xmodule/conditional_module.py
+++ b/common/lib/xmodule/xmodule/conditional_module.py
@@ -114,10 +114,10 @@ class ConditionalModule(ConditionalFields, XModule, StudioEditableModule):

    js = {
        'coffee': [
-            resource_string(__name__, 'js/src/javascript_loader.coffee'),
            resource_string(__name__, 'js/src/conditional/display.coffee'),
        ],
        'js': [
+            resource_string(__name__, 'js/src/javascript_loader.js'),
            resource_string(__name__, 'js/src/collapsible.js'),
        ]
    }