Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that window.course is avaiable before anyone accesses it.

Browse Source 
TNL-4106
This commit is contained in:
cahrens
2016-02-10 13:55:03 -05:00
parent 85591696d8
commit 30c42e724d
4 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cms/static/cms/js/build.js
View File

@@ -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',

2
cms/static/js/factories/base.js
View File

@@ -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']);

6
cms/static/js/factories/course.js
View File

@@ -1,6 +0,0 @@
define(['js/models/course'], function(Course) {
'use strict';
return function (courseInfo) {
window.course = new Course(courseInfo);
}
});

36
cms/templates/base.html
View File

@@ -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>