From f4bede6c5b03ab6827482926da8ab8645d5c4718 Mon Sep 17 00:00:00 2001
From: Brian Jacobel <bjacobel@gmail.com>
Date: Fri, 20 May 2016 12:52:59 -0400
Subject: [PATCH] Fix library load paths (incl. jquery.scrollTo)
Simplify paths in karma_cms_squire require paths
---
cms/static/cms/js/require-config.js | 2 +-
cms/static/coffee/spec/main.coffee | 2 +-
cms/static/coffee/spec/main_squire.coffee | 6 +++---
.../spec/views/certificate_editor_spec.js | 15 ---------------
.../spec/views/certificates_list_spec.js | 17 -----------------
cms/static/karma_cms_squire.conf.js | 4 ++--
common/static/common/js/spec/main_requirejs.js | 2 +-
common/static/js/vendor/jquery.scrollTo.min.js | 1 -
lms/static/js/spec/main.js | 4 ++--
lms/static/lms/js/require-config.js | 1 +
.../courseware/courseware-chromeless.html | 2 +-
lms/templates/courseware/courseware.html | 2 +-
pavelib/assets.py | 1 +
13 files changed, 14 insertions(+), 45 deletions(-)
delete mode 120000 common/static/js/vendor/jquery.scrollTo.min.js
diff --git a/cms/static/cms/js/require-config.js b/cms/static/cms/js/require-config.js
index 7404ef2b693..b5f4cf39556 100644
--- a/cms/static/cms/js/require-config.js
+++ b/cms/static/cms/js/require-config.js
@@ -38,7 +38,7 @@
"jquery.timepicker": "js/vendor/timepicker/jquery.timepicker",
"jquery.cookie": "js/vendor/jquery.cookie",
"jquery.qtip": "js/vendor/jquery.qtip.min",
- "jquery.scrollTo": "js/vendor/jquery.scrollTo.min",
+ "jquery.scrollTo": "common/js/vendor/jquery.scrollTo",
"jquery.flot": "js/vendor/flot/jquery.flot.min",
"jquery.fileupload": "js/vendor/jQuery-File-Upload/js/jquery.fileupload",
"jquery.fileupload-process": "js/vendor/jQuery-File-Upload/js/jquery.fileupload-process",
diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee
index b96ce21fe61..d9c3f912650 100644
--- a/cms/static/coffee/spec/main.coffee
+++ b/cms/static/coffee/spec/main.coffee
@@ -12,7 +12,7 @@ requirejs.config({
"jquery.leanModal": "xmodule_js/common_static/js/vendor/jquery.leanModal",
"jquery.ajaxQueue": "xmodule_js/common_static/js/vendor/jquery.ajaxQueue",
"jquery.smoothScroll": "xmodule_js/common_static/js/vendor/jquery.smooth-scroll.min",
- "jquery.scrollTo": "xmodule_js/common_static/js/vendor/jquery.scrollTo.min",
+ "jquery.scrollTo": "common/js/vendor/jquery.scrollTo",
"jquery.timepicker": "xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker",
"jquery.cookie": "xmodule_js/common_static/js/vendor/jquery.cookie",
"jquery.qtip": "xmodule_js/common_static/js/vendor/jquery.qtip.min",
diff --git a/cms/static/coffee/spec/main_squire.coffee b/cms/static/coffee/spec/main_squire.coffee
index 240d58a8a0b..5bea6ba849c 100644
--- a/cms/static/coffee/spec/main_squire.coffee
+++ b/cms/static/coffee/spec/main_squire.coffee
@@ -5,14 +5,14 @@ requirejs.config({
"gettext": "xmodule_js/common_static/js/test/i18n",
"mustache": "xmodule_js/common_static/js/vendor/mustache",
"codemirror": "xmodule_js/common_static/js/vendor/CodeMirror/codemirror",
- "jquery": "xmodule_js/common_static/common/js/vendor/jquery",
- "jquery-migrate": "xmodule_js/common_static/common/js/vendor/jquery-migrate",
+ "jquery": "common/js/vendor/jquery",
+ "jquery-migrate": "common/js/vendor/jquery-migrate",
"jquery.ui": "xmodule_js/common_static/js/vendor/jquery-ui.min",
"jquery.form": "xmodule_js/common_static/js/vendor/jquery.form",
"jquery.markitup": "xmodule_js/common_static/js/vendor/markitup/jquery.markitup",
"jquery.leanModal": "xmodule_js/common_static/js/vendor/jquery.leanModal",
"jquery.smoothScroll": "xmodule_js/common_static/js/vendor/jquery.smooth-scroll.min",
- "jquery.scrollTo": "xmodule_js/common_static/js/vendor/jquery.scrollTo.min",
+ "jquery.scrollTo": "common/js/vendor/jquery.scrollTo",
"jquery.timepicker": "xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker",
"jquery.cookie": "xmodule_js/common_static/js/vendor/jquery.cookie",
"jquery.qtip": "xmodule_js/common_static/js/vendor/jquery.qtip.min",
diff --git a/cms/static/js/certificates/spec/views/certificate_editor_spec.js b/cms/static/js/certificates/spec/views/certificate_editor_spec.js
index d62dfbea923..f2780d07bdd 100644
--- a/cms/static/js/certificates/spec/views/certificate_editor_spec.js
+++ b/cms/static/js/certificates/spec/views/certificate_editor_spec.js
@@ -90,16 +90,6 @@ function(_, Course, CertificateModel, SignatoryModel, CertificatesCollection, Ce
uploadDialogTpl = readFixtures('upload-dialog.underscore');
beforeEach(function() {
- window.course = new Course({
- id: '5',
- name: 'Course Name',
- url_name: 'course_name',
- org: 'course_org',
- num: 'course_num',
- revision: 'course_rev'
- });
- window.CMS.User = {isGlobalStaff: true};
-
TemplateHelpers.installTemplates(['certificate-editor', 'signatory-editor'], true);
window.course = new Course({
@@ -137,11 +127,6 @@ function(_, Course, CertificateModel, SignatoryModel, CertificatesCollection, Ce
delete window.CMS.User;
});
- afterEach(function() {
- delete window.course;
- delete window.CMS.User;
- });
-
describe('Basic', function () {
beforeEach(function(){
appendSetFixtures(
diff --git a/cms/static/js/certificates/spec/views/certificates_list_spec.js b/cms/static/js/certificates/spec/views/certificates_list_spec.js
index fad127b8ae6..f0ad00e4b2d 100644
--- a/cms/static/js/certificates/spec/views/certificates_list_spec.js
+++ b/cms/static/js/certificates/spec/views/certificates_list_spec.js
@@ -31,19 +31,6 @@ function(_, Course, CertificatesCollection, CertificateModel, CertificateDetails
var emptyMessage = 'You have not created any certificates yet.';
beforeEach(function() {
- window.course = new Course({
- id: '5',
- name: 'Course Name',
- url_name: 'course_name',
- org: 'course_org',
- num: 'course_num',
- revision: 'course_rev'
- });
- window.certWebPreview = new CertificatePreview({
- course_modes: ['honor', 'test'],
- certificate_web_view_url: '/users/1/courses/orgX/009/2016'
- });
-
TemplateHelpers.installTemplates(
['certificate-editor', 'list']
);
@@ -83,10 +70,6 @@ function(_, Course, CertificatesCollection, CertificateModel, CertificateDetails
delete window.CMS.User;
});
- afterEach(function() {
- delete window.course;
- });
-
describe('empty template', function () {
it('should be rendered if no certificates', function() {
expect(this.view.$(SELECTORS.noContent)).toExist();
diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js
index d58bdc16dd9..093e51bb554 100644
--- a/cms/static/karma_cms_squire.conf.js
+++ b/cms/static/karma_cms_squire.conf.js
@@ -14,8 +14,8 @@ var options = {
libraryFiles: [],
libraryFilesToInclude: [
- {pattern: 'xmodule_js/common_static/common/js/vendor/jquery.js', included: true},
- {pattern: 'xmodule_js/common_static/common/js/vendor/jquery-migrate.js', included: true}
+ {pattern: 'common/js/vendor/jquery.js', included: true},
+ {pattern: 'common/js/vendor/jquery-migrate.js', included: true}
],
// Make sure the patterns in sourceFiles and specFiles do not match the same file.
diff --git a/common/static/common/js/spec/main_requirejs.js b/common/static/common/js/spec/main_requirejs.js
index 7004b93c58b..6e120437293 100644
--- a/common/static/common/js/spec/main_requirejs.js
+++ b/common/static/common/js/spec/main_requirejs.js
@@ -14,7 +14,7 @@
'jquery.leanModal': 'js/vendor/jquery.leanModal',
'jquery.ajaxQueue': 'js/vendor/jquery.ajaxQueue',
'jquery.smoothScroll': 'js/vendor/jquery.smooth-scroll.min',
- 'jquery.scrollTo': 'js/vendor/jquery.scrollTo.min',
+ 'jquery.scrollTo': 'common/js/vendor/jquery.scrollTo',
'jquery.timepicker': 'js/vendor/timepicker/jquery.timepicker',
'jquery.cookie': 'js/vendor/jquery.cookie',
'jquery.qtip': 'js/vendor/jquery.qtip.min',
diff --git a/common/static/js/vendor/jquery.scrollTo.min.js b/common/static/js/vendor/jquery.scrollTo.min.js
deleted file mode 120000
index a019acd5eb2..00000000000
--- a/common/static/js/vendor/jquery.scrollTo.min.js
+++ /dev/null
@@ -1 +0,0 @@
-../../../../node_modules/jquery.scrollto/jquery.scrollTo.min.js
\ No newline at end of file
diff --git a/lms/static/js/spec/main.js b/lms/static/js/spec/main.js
index 3a135e7cc3f..daeda3a82ce 100644
--- a/lms/static/js/spec/main.js
+++ b/lms/static/js/spec/main.js
@@ -19,7 +19,7 @@
'jquery.ajaxQueue': 'xmodule_js/common_static/js/vendor/jquery.ajaxQueue',
'jquery.ajax-retry': 'js/vendor/jquery.ajax-retry',
'jquery.smoothScroll': 'xmodule_js/common_static/js/vendor/jquery.smooth-scroll.min',
- 'jquery.scrollTo': 'xmodule_js/common_static/js/vendor/jquery.scrollTo.min',
+ 'jquery.scrollTo': 'common/js/vendor/jquery.scrollTo',
'jquery.timepicker': 'xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker',
'jquery.cookie': 'xmodule_js/common_static/js/vendor/jquery.cookie',
'jquery.qtip': 'xmodule_js/common_static/js/vendor/jquery.qtip.min',
@@ -93,7 +93,7 @@
// Discussion classes loaded explicitly until they are converted to use RequireJS
'DiscussionModuleView': 'xmodule_js/common_static/coffee/src/discussion/discussion_module_view',
-
+
'js/bookmarks/collections/bookmarks': 'js/bookmarks/collections/bookmarks',
'js/bookmarks/models/bookmark': 'js/bookmarks/models/bookmark',
'js/bookmarks/views/bookmarks_list_button': 'js/bookmarks/views/bookmarks_list_button',
diff --git a/lms/static/lms/js/require-config.js b/lms/static/lms/js/require-config.js
index 97debf0f522..f2dabdea535 100644
--- a/lms/static/lms/js/require-config.js
+++ b/lms/static/lms/js/require-config.js
@@ -71,6 +71,7 @@
// libraries.
"jquery": "common/js/vendor/jquery",
"jquery-migrate": "common/js/vendor/jquery-migrate",
+ "jquery.scrollTo": "common/js/vendor/jquery.scrollTo",
"jquery.cookie": "js/vendor/jquery.cookie",
'jquery.timeago': 'js/vendor/jquery.timeago',
"jquery.url": "js/vendor/url.min",
diff --git a/lms/templates/courseware/courseware-chromeless.html b/lms/templates/courseware/courseware-chromeless.html
index ebc8eb31bb1..2648e3fd9f4 100644
--- a/lms/templates/courseware/courseware-chromeless.html
+++ b/lms/templates/courseware/courseware-chromeless.html
@@ -45,7 +45,7 @@ ${static.get_page_title_breadcrumbs(course_name())}
</%block>
<%block name="js_extra">
- <script type="text/javascript" src="${static.url('js/vendor/jquery.scrollTo.min.js')}"></script>
+ <script type="text/javascript" src="${static.url('common/js/vendor/jquery.scrollTo.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
## codemirror
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index 476b80ce1ea..f5a4e90c42b 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -65,7 +65,7 @@ ${static.get_page_title_breadcrumbs(course_name())}
</%block>
<%block name="js_extra">
- <script type="text/javascript" src="${static.url('js/vendor/jquery.scrollTo.min.js')}"></script>
+ <script type="text/javascript" src="${static.url('common/js/vendor/jquery.scrollTo.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
## codemirror
diff --git a/pavelib/assets.py b/pavelib/assets.py
index 4254d2cee04..5f328f4e9a5 100644
--- a/pavelib/assets.py
+++ b/pavelib/assets.py
@@ -47,6 +47,7 @@ SASS_LOAD_PATHS = [
NPM_INSTALLED_LIBRARIES = [
'jquery/dist/jquery.js',
'jquery-migrate/dist/jquery-migrate.js',
+ 'jquery.scrollto/jquery.scrollTo.js',
'underscore/underscore.js',
'underscore.string/dist/underscore.string.js',
'picturefill/dist/picturefill.js',
--
GitLab