Revert "Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…"

common/djangoapps/pipeline_mako/templates/static_content.html

@@ -164,7 +164,7 @@ source, template_path = Loader(engine).load_template_source(path)
     </script>
 </%def>
 
-<%def name="invoke_page_bundle(page_name, class_name=None)">
+<%def name="invoke_page_bundle(page_name, class_name)">
     <%doc>
       Loads Javascript onto your page synchronously.
       Uses RequireJS in development and a plain script tag in production.
@@ -174,18 +174,16 @@ source, template_path = Loader(engine).load_template_source(path)
     <%
         body = capture(caller.body)
     %>
-    % if class_name:
-        <script type="text/javascript">
-            if (typeof pageFactoryArguments == "undefined") {
-                var pageFactoryArguments = {};
-            }
-            % if body:
-                pageFactoryArguments['${class_name | n, js_escaped_string}'] = [${ body | n, decode.utf8 }];
-            % else:
-                pageFactoryArguments['${class_name | n, js_escaped_string}'] = [];
-            % endif
-        </script>
-    % endif
+    <script type="text/javascript">
+        if (typeof pageFactoryArguments == "undefined") {
+            var pageFactoryArguments = {};
+        }
+        % if body:
+        pageFactoryArguments['${class_name | n, js_escaped_string}'] = [${ body | n, decode.utf8 }];
+        % else:
+        pageFactoryArguments['${class_name | n, js_escaped_string}'] = [];
+        % endif
+    </script>
     <%self:webpack entry="${page_name}"/>
 </%def>
 

common/djangoapps/terrain/ui_helpers.py

@@ -51,6 +51,12 @@ REQUIREJS_WAIT = {
         "js/sock", "gettext", "js/base",
         "jquery.ui", "cms/js/main", "underscore"],
 
+    # Upload
+    re.compile(r'^\s*Files & Uploads'): [
+        'js/base', 'jquery.ui', 'cms/js/main', 'underscore',
+        'js/views/assets', 'js/views/asset'
+    ],
+
     # Pages
     re.compile(r'^Pages \|'): [
         'js/models/explicit_url', 'js/views/tabs',