From 30c42e724d65bd359c7fb580f50c8f88e25351a4 Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Wed, 10 Feb 2016 13:55:03 -0500
Subject: [PATCH] Ensure that window.course is avaiable before anyone accesses
 it.

TNL-4106
---
 cms/static/cms/js/build.js        |  1 -
 cms/static/js/factories/base.js   |  2 +-
 cms/static/js/factories/course.js |  6 ------
 cms/templates/base.html           | 36 +++++++++++++++----------------
 4 files changed, 19 insertions(+), 26 deletions(-)
 delete mode 100644 cms/static/js/factories/course.js

diff --git a/cms/static/cms/js/build.js b/cms/static/cms/js/build.js
index f8481e443e..65e78c3e62 100644
--- a/cms/static/cms/js/build.js
+++ b/cms/static/cms/js/build.js
@@ -35,7 +35,6 @@
             'js/factories/asset_index',
             'js/factories/base',
             'js/factories/container',
-            'js/factories/course',
             'js/factories/course_create_rerun',
             'js/factories/course_info',
             'js/factories/edit_tabs',
diff --git a/cms/static/js/factories/base.js b/cms/static/js/factories/base.js
index 305705dea1..b6f997c8e4 100644
--- a/cms/static/js/factories/base.js
+++ b/cms/static/js/factories/base.js
@@ -1,2 +1,2 @@
 define(['js/base', 'coffee/src/main', 'js/src/logger', 'datepair', 'accessibility',
-'ieshim', 'tooltip_manager', 'lang_edx']);
+'ieshim', 'tooltip_manager', 'lang_edx', 'js/models/course']);
diff --git a/cms/static/js/factories/course.js b/cms/static/js/factories/course.js
deleted file mode 100644
index b5b5f8ad84..0000000000
--- a/cms/static/js/factories/course.js
+++ /dev/null
@@ -1,6 +0,0 @@
-define(['js/models/course'], function(Course) {
-    'use strict';
-    return function (courseInfo) {
-        window.course = new Course(courseInfo);
-    }
-});
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 512669c9b2..51db3f154c 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -82,24 +82,24 @@ from openedx.core.djangolib.js_utils import (
     <script type="text/javascript">
       require(['common/js/common_libraries'], function () {
           require(['js/factories/base'], function () {
-            % if context_course:
-              require(['js/factories/course'], function(CourseFactory) {
-                  CourseFactory({
-                      id: "${context_course.id | n, js_escaped_string}",
-                      name: "${context_course.display_name_with_default_escaped | h}",
-                      url_name: "${context_course.location.name | h}",
-                      org: "${context_course.location.org | h}",
-                      num: "${context_course.location.course | h}",
-                      display_course_number: "${context_course.display_coursenumber | n, js_escaped_string}",
-                      revision: "${context_course.location.revision | h}",
-                      self_paced: ${context_course.self_paced | n, dump_js_escaped_json}
-                  });
-              });
-            % endif
-            % if user.is_authenticated():
-                require(['js/sock']);
-            % endif
-            <%block name='requirejs'></%block>
+               require(['js/models/course'], function(Course) {
+                   % if context_course:
+                       window.course = new Course({
+                           id: "${context_course.id | n, js_escaped_string}",
+                           name: "${context_course.display_name_with_default_escaped | h}",
+                           url_name: "${context_course.location.name | h}",
+                           org: "${context_course.location.org | h}",
+                           num: "${context_course.location.course | h}",
+                           display_course_number: "${context_course.display_coursenumber | n, js_escaped_string}",
+                           revision: "${context_course.location.revision | h}",
+                           self_paced: ${context_course.self_paced | n, dump_js_escaped_json}
+                       });
+                   % endif
+                   % if user.is_authenticated():
+                       require(['js/sock']);
+                   % endif
+                   <%block name='requirejs'></%block>
+               });
           });
       });
     </script>