From 68645db38b7835aa02b2a0631a4bdd3157009785 Mon Sep 17 00:00:00 2001 From: cahrens Date: Thu, 6 Aug 2015 14:57:12 -0400 Subject: [PATCH] Reduce dependency on courseware_js. TNL-2945 --- lms/djangoapps/student_account/views.py | 1 + lms/djangoapps/student_profile/views.py | 3 ++- lms/djangoapps/teams/views.py | 3 ++- lms/envs/common.py | 20 +++++--------------- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/lms/djangoapps/student_account/views.py b/lms/djangoapps/student_account/views.py index 39da3a385c..a2eda85848 100644 --- a/lms/djangoapps/student_account/views.py +++ b/lms/djangoapps/student_account/views.py @@ -381,6 +381,7 @@ def account_settings_context(request): 'platform_name': settings.PLATFORM_NAME, 'user_accounts_api_url': reverse("accounts_api", kwargs={'username': user.username}), 'user_preferences_api_url': reverse('preferences_api', kwargs={'username': user.username}), + 'disable_courseware_js': True, } if third_party_auth.is_enabled(): diff --git a/lms/djangoapps/student_profile/views.py b/lms/djangoapps/student_profile/views.py index 76620b419b..4020852015 100644 --- a/lms/djangoapps/student_profile/views.py +++ b/lms/djangoapps/student_profile/views.py @@ -92,6 +92,7 @@ def learner_profile_context(logged_in_user, profile_username, user_is_staff, bui 'country_options': list(countries), 'language_options': settings.ALL_LANGUAGES, 'platform_name': microsite.get_value('platform_name', settings.PLATFORM_NAME), - } + }, + 'disable_courseware_js': True, } return context diff --git a/lms/djangoapps/teams/views.py b/lms/djangoapps/teams/views.py index cdcd92c08b..3430d0198a 100644 --- a/lms/djangoapps/teams/views.py +++ b/lms/djangoapps/teams/views.py @@ -102,7 +102,8 @@ class TeamsDashboardView(View): "languages": settings.ALL_LANGUAGES, "countries": list(countries), "username": user.username, - "privileged": has_discussion_privileges(user, course_key) + "privileged": has_discussion_privileges(user, course_key), + "disable_courseware_js": True, } return render_to_response("teams/teams.html", context) diff --git a/lms/envs/common.py b/lms/envs/common.py index 2d1185a048..009986b313 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1248,6 +1248,11 @@ main_vendor_js = base_vendor_js + [ base_application_js = [ 'js/src/utility.js', 'js/src/logger.js', + 'js/my_courses_dropdown.js', + 'js/src/string_utils.js', + 'js/form.ext.js', + 'js/src/ie_shim.js', + 'js/src/accessibility_tools.js', ] dashboard_js = ( @@ -1267,14 +1272,9 @@ instructor_dash_js = ( # JavaScript modules. student_account_js = [ 'js/utils/edx.utils.validate.js', - 'js/form.ext.js', - 'js/my_courses_dropdown.js', 'js/toggle_login_modal.js', 'js/sticky_filter.js', 'js/query-params.js', - 'js/src/accessibility_tools.js', - 'js/src/ie_shim.js', - 'js/src/string_utils.js', 'js/student_account/models/LoginModel.js', 'js/student_account/models/RegisterModel.js', 'js/student_account/models/PasswordResetModel.js', @@ -1289,14 +1289,9 @@ student_account_js = [ ] verify_student_js = [ - 'js/form.ext.js', - 'js/my_courses_dropdown.js', 'js/toggle_login_modal.js', 'js/sticky_filter.js', 'js/query-params.js', - 'js/src/accessibility_tools.js', - 'js/src/ie_shim.js', - 'js/src/string_utils.js', 'js/verify_student/models/verification_model.js', 'js/verify_student/views/error_view.js', 'js/verify_student/views/image_input_view.js', @@ -1487,14 +1482,9 @@ PIPELINE_JS = { # Application will contain all paths not in courseware_only_js 'source_filenames': ['js/xblock/core.js'] + sorted(common_js) + sorted(project_js) + base_application_js + [ - 'js/form.ext.js', - 'js/my_courses_dropdown.js', 'js/toggle_login_modal.js', 'js/sticky_filter.js', 'js/query-params.js', - 'js/src/accessibility_tools.js', - 'js/src/ie_shim.js', - 'js/src/string_utils.js', ], 'output_filename': 'js/lms-application.js', },