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

Upgrade backbone via npm.

Browse Source 
TNL-4335
This commit is contained in:
muzaffaryousaf
2016-04-05 16:38:38 +05:00
parent d670f8c4da
commit e89a32d5c6
18 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/static/cms/js/require-config.js
View File

@@ -52,7 +52,7 @@
"text": 'js/vendor/requirejs/text',
"underscore": "common/js/vendor/underscore",
"underscore.string": "common/js/vendor/underscore.string",
"backbone": "js/vendor/backbone-min",
"backbone": "common/js/vendor/backbone-min",
"backbone-relational" : "js/vendor/backbone-relational.min",
"backbone.associations": "js/vendor/backbone-associations-min",
"backbone.paginator": "js/vendor/backbone.paginator.min",

2
cms/static/coffee/spec/main.coffee
View File

@@ -29,7 +29,7 @@ requirejs.config({
"text": "xmodule_js/common_static/js/vendor/requirejs/text",
"underscore": "xmodule_js/common_static/common/js/vendor/underscore",
"underscore.string": "xmodule_js/common_static/common/js/vendor/underscore.string",
"backbone": "xmodule_js/common_static/js/vendor/backbone-min",
"backbone": "xmodule_js/common_static/common/js/vendor/backbone-min",
"backbone.associations": "xmodule_js/common_static/js/vendor/backbone-associations-min",
"backbone.paginator": "xmodule_js/common_static/js/vendor/backbone.paginator.min",
"backbone-relational": "xmodule_js/common_static/js/vendor/backbone-relational.min",

2
cms/static/coffee/spec/main_squire.coffee
View File

@@ -26,7 +26,7 @@ requirejs.config({
"text": "xmodule_js/common_static/js/vendor/requirejs/text",
"underscore": "common/js/vendor/underscore",
"underscore.string": "common/js/vendor/underscore.string",
"backbone": "xmodule_js/common_static/js/vendor/backbone-min",
"backbone": "xmodule_js/common_static/common/js/vendor/backbone-min",
"backbone.associations": "xmodule_js/common_static/js/vendor/backbone-associations-min",
"backbone.paginator": "xmodule_js/common_static/js/vendor/backbone.paginator.min",
"tinymce": "xmodule_js/common_static/js/vendor/tinymce/js/tinymce/tinymce.full.min",

2
cms/static/js_test.yml
View File

@@ -37,7 +37,7 @@ lib_paths:
- xmodule_js/common_static/js/vendor/jquery.simulate.js
- xmodule_js/common_static/common/js/vendor/underscore.js
- xmodule_js/common_static/common/js/vendor/underscore.string.js
- xmodule_js/common_static/js/vendor/backbone-min.js
- xmodule_js/common_static/common/js/vendor/backbone-min.js
- xmodule_js/common_static/js/vendor/backbone-associations-min.js
- xmodule_js/common_static/js/vendor/backbone.paginator.min.js
- xmodule_js/common_static/js/vendor/backbone-relational.min.js

2
cms/static/js_test_squire.yml
View File

@@ -36,7 +36,7 @@ lib_paths:
- xmodule_js/common_static/js/vendor/jquery.cookie.js
- xmodule_js/common_static/common/js/vendor/underscore.js
- xmodule_js/common_static/common/js/vendor/underscore.string.js
- xmodule_js/common_static/js/vendor/backbone-min.js
- xmodule_js/common_static/common/js/vendor/backbone-min.js
- xmodule_js/common_static/js/vendor/backbone-associations-min.js
- xmodule_js/common_static/js/vendor/backbone.paginator.min.js
- xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker.js

4
common/djangoapps/pipeline_mako/tests/test_render.py
View File

@@ -15,7 +15,7 @@ class RequireJSPathOverridesTest(TestCase):
OVERRIDES = {
'jquery': 'js/vendor/jquery.min.js',
'backbone': 'js/vendor/backbone-min.js',
'backbone': 'common/js/vendor/backbone-min.js',
'text': 'js/vendor/text.js'
}
@@ -26,7 +26,7 @@ class RequireJSPathOverridesTest(TestCase):
"paths: {",
"'jquery': 'js/vendor/jquery.min',",
"'text': 'js/vendor/text',",
"'backbone': 'js/vendor/backbone-min'",
"'backbone': 'common/js/vendor/backbone-min'",
"}",
"});",
"}).call(this, require || RequireJS.require);",

2
common/lib/xmodule/xmodule/js/js_test.yml
View File

@@ -46,7 +46,7 @@ lib_paths:
- common_static/js/vendor/jquery.cookie.js
- common_static/js/vendor/json2.js
- common_static/common/js/vendor/underscore.js
- common_static/js/vendor/backbone-min.js
- common_static/common/js/vendor/backbone-min.js
- common_static/js/vendor/jquery.leanModal.js
- common_static/js/vendor/CodeMirror/codemirror.js
- common_static/js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js

2
common/static/common/js/spec/main_requirejs.js
View File

@@ -25,7 +25,7 @@
'text': 'js/vendor/requirejs/text',
'underscore': 'common/js/vendor/underscore',
'underscore.string': 'common/js/vendor/underscore.string',
'backbone': 'js/vendor/backbone-min',
'backbone': 'common/js/vendor/backbone-min',
'backbone.associations': 'js/vendor/backbone-associations-min',
'backbone.paginator': 'js/vendor/backbone.paginator.min',
'backbone-super': 'js/vendor/backbone-super',

1
common/static/js/vendor/backbone-min.js vendored
View File

File diff suppressed because one or more lines are too long

2
common/static/js_test.yml
View File

@@ -35,7 +35,7 @@ lib_paths:
- js/vendor/mustache.js
- common/js/vendor/underscore.js
- common/js/vendor/underscore.string.js
- js/vendor/backbone-min.js
- common/js/vendor/backbone-min.js
- js/vendor/jquery.timeago.js
- js/vendor/URI.min.js
- js/vendor/draggabilly.js

2
common/static/js_test_requirejs.yml
View File

@@ -36,7 +36,7 @@ lib_paths:
- js/vendor/jquery.truncate.js
- common/js/vendor/underscore.js
- common/js/vendor/underscore.string.js
- js/vendor/backbone-min.js
- common/js/vendor/backbone-min.js
- js/vendor/backbone.paginator.min.js
- js/vendor/jquery.timeago.js
- js/vendor/URI.min.js

2
lms/envs/common.py
View File

@@ -1268,7 +1268,7 @@ base_vendor_js = [
'js/vendor/requirejs/require.js',
'js/RequireJS-namespace-undefine.js',
'js/vendor/URI.min.js',
'js/vendor/backbone-min.js',
'common/js/vendor/backbone-min.js',
'edx-pattern-library/js/modernizr-custom.js',
]

2
lms/static/js/spec/main.js
View File

@@ -33,7 +33,7 @@
'text': 'xmodule_js/common_static/js/vendor/requirejs/text',
'underscore': 'common/js/vendor/underscore',
'underscore.string': 'common/js/vendor/underscore.string',
'backbone': 'xmodule_js/common_static/js/vendor/backbone-min',
'backbone': 'xmodule_js/common_static/common/js/vendor/backbone-min',
'backbone.associations': 'xmodule_js/common_static/js/vendor/backbone-associations-min',
'backbone.paginator': 'xmodule_js/common_static/js/vendor/backbone.paginator.min',
'backbone-super': 'js/vendor/backbone-super',

2
lms/static/js_test.yml
View File

@@ -57,7 +57,7 @@ lib_paths:
- xmodule_js/common_static/js/src/
- xmodule_js/common_static/common/js/vendor/underscore.js
- xmodule_js/common_static/common/js/vendor/underscore.string.js
- xmodule_js/common_static/js/vendor/backbone-min.js
- xmodule_js/common_static/common/js/vendor/backbone-min.js
- xmodule_js/common_static/js/vendor/backbone.paginator.min.js
- xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min.js
- xmodule_js/common_static/js/test/i18n.js

2
lms/static/lms/js/require-config.js
View File

@@ -59,7 +59,7 @@
"moment-with-locales": "xmodule_js/common_static/js/vendor/moment-with-locales.min",
"text": "js/vendor/requirejs/text",
"logger": "js/src/logger",
"backbone": "js/vendor/backbone-min",
"backbone": "common/js/vendor/backbone-min",
"backbone-super": "js/vendor/backbone-super",
"backbone.paginator": "js/vendor/backbone.paginator.min",
"underscore": "common/js/vendor/underscore",

2
lms/templates/ccx/schedule.html
View File

@@ -13,7 +13,7 @@ from openedx.core.djangolib.js_utils import (
var save_url = '${save_url | n, js_escaped_string}';
var schedule = ${schedule | n, dump_js_escaped_json};
</script>
<script src="${static.url('js/vendor/backbone-min.js')}"></script>
<script src="${static.url('common/js/vendor/backbone-min.js')}"></script>
<script src="${static.url('js/vendor/timepicker/jquery.timepicker.js')}"></script>
<link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
<style>

3
package.json
View File

@@ -9,7 +9,8 @@
"uglify-js": "2.4.24",
"underscore": "~1.8.3",
"underscore.string": "~3.3.4",
"picturefill": "~3.0.2"
"picturefill": "~3.0.2",
"backbone": "~1.3.2"
},
"devDependencies": {
"edx-custom-a11y-rules": "edx/edx-custom-a11y-rules",

3
pavelib/assets.py
View File

@@ -47,7 +47,8 @@ SASS_LOAD_PATHS = [
NPM_INSTALLED_LIBRARIES = [
'underscore/underscore.js',
'underscore.string/dist/underscore.string.js',
'picturefill/dist/picturefill.min.js'
'picturefill/dist/picturefill.min.js',
'backbone/backbone-min.js',
]
# Directory to install static vendor files