diff --git a/cms/static/cms/js/require-config.js b/cms/static/cms/js/require-config.js
index 18f86f355c96ea4908637a41c5a8a5983ec9a028..d026b4936cada35c437e4696c64d7799f9d3b4d3 100644
--- a/cms/static/cms/js/require-config.js
+++ b/cms/static/cms/js/require-config.js
@@ -52,7 +52,7 @@
"text": 'js/vendor/requirejs/text',
"underscore": "common/js/vendor/underscore",
"underscore.string": "common/js/vendor/underscore.string",
- "backbone": "common/js/vendor/backbone-min",
+ "backbone": "common/js/vendor/backbone",
"backbone-relational" : "js/vendor/backbone-relational.min",
"backbone.associations": "js/vendor/backbone-associations-min",
"backbone.paginator": "js/vendor/backbone.paginator.min",
diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee
index a3b8eb237c6b66e445d4582c6e0b729691477818..87253d01f1ac63c413847e0549091e20de75d0d0 100644
--- a/cms/static/coffee/spec/main.coffee
+++ b/cms/static/coffee/spec/main.coffee
@@ -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/common/js/vendor/backbone-min",
+ "backbone": "xmodule_js/common_static/common/js/vendor/backbone",
"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",
diff --git a/cms/static/coffee/spec/main_squire.coffee b/cms/static/coffee/spec/main_squire.coffee
index b155a0e667b61e285fa3f3c8c310c179b527e2a7..e2ab5fc35d99d59905fe532534698e997faa370b 100644
--- a/cms/static/coffee/spec/main_squire.coffee
+++ b/cms/static/coffee/spec/main_squire.coffee
@@ -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/common/js/vendor/backbone-min",
+ "backbone": "xmodule_js/common_static/common/js/vendor/backbone",
"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",
diff --git a/cms/static/js_test.yml b/cms/static/js_test.yml
index ed014993ebdee45b8496da7e5e04163abd75bb53..3953a9cec51ab82181098422b02b0917dfe22cf6 100644
--- a/cms/static/js_test.yml
+++ b/cms/static/js_test.yml
@@ -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/common/js/vendor/backbone-min.js
+ - xmodule_js/common_static/common/js/vendor/backbone.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
diff --git a/cms/static/js_test_squire.yml b/cms/static/js_test_squire.yml
index eca7ae1d347d762c124434cbeb61a9762d352980..4c20a67d2e2f8409bd4ba61d7b493878555db382 100644
--- a/cms/static/js_test_squire.yml
+++ b/cms/static/js_test_squire.yml
@@ -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/common/js/vendor/backbone-min.js
+ - xmodule_js/common_static/common/js/vendor/backbone.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
diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js
index f86da7cc515b75f79088b5bc7126796bbf495839..b315e2e962b6854d5753cbfe9bd8ca0839385a5f 100644
--- a/cms/static/karma_cms.conf.js
+++ b/cms/static/karma_cms.conf.js
@@ -35,7 +35,7 @@ var libraryFiles = [
{pattern: 'xmodule_js/common_static/js/vendor/jquery.simulate.js', included: false},
{pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js', included: false},
{pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js', included: false},
- {pattern: 'xmodule_js/common_static/common/js/vendor/backbone-min.js', included: false},
+ {pattern: 'xmodule_js/common_static/common/js/vendor/backbone.js', included: false},
{pattern: 'xmodule_js/common_static/js/vendor/backbone-associations-min.js', included: false},
{pattern: 'xmodule_js/common_static/js/vendor/backbone.paginator.min.js', included: false},
{pattern: 'xmodule_js/common_static/js/vendor/backbone-relational.min.js', included: false},
diff --git a/cms/static/karma_cms_squire.conf.js b/cms/static/karma_cms_squire.conf.js
index 7e23b748a95178d225b48172dde441a7942c2d69..7d6ec267489c5bd3a55ac379cdab638efff42044 100644
--- a/cms/static/karma_cms_squire.conf.js
+++ b/cms/static/karma_cms_squire.conf.js
@@ -35,7 +35,7 @@ var libraryFiles = [
{pattern: 'xmodule_js/common_static/js/vendor/jquery.cookie.js', included: false},
{pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js', included: false},
{pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js', included: false},
- {pattern: 'xmodule_js/common_static/common/js/vendor/backbone-min.js', included: false},
+ {pattern: 'xmodule_js/common_static/common/js/vendor/backbone.js', included: false},
{pattern: 'xmodule_js/common_static/js/vendor/backbone-associations-min.js', included: false},
{pattern: 'xmodule_js/common_static/js/vendor/backbone.paginator.min.js', included: false},
{pattern: 'xmodule_js/common_static/js/vendor/timepicker/jquery.timepicker.js', included: false},
diff --git a/common/djangoapps/pipeline_mako/tests/test_render.py b/common/djangoapps/pipeline_mako/tests/test_render.py
index d99d337572ce967b2aad9c4b12bd502693af6402..4c072075c50e12ae96bb35df5ca2bfdf308abd2c 100644
--- a/common/djangoapps/pipeline_mako/tests/test_render.py
+++ b/common/djangoapps/pipeline_mako/tests/test_render.py
@@ -15,7 +15,7 @@ class RequireJSPathOverridesTest(TestCase):
OVERRIDES = {
'jquery': 'js/vendor/jquery.min.js',
- 'backbone': 'common/js/vendor/backbone-min.js',
+ 'backbone': 'common/js/vendor/backbone.js',
'text': 'js/vendor/text.js'
}
@@ -26,7 +26,7 @@ class RequireJSPathOverridesTest(TestCase):
"paths: {",
"'jquery': 'js/vendor/jquery.min',",
"'text': 'js/vendor/text',",
- "'backbone': 'common/js/vendor/backbone-min'",
+ "'backbone': 'common/js/vendor/backbone'",
"}",
"});",
"}).call(this, require || RequireJS.require);",
diff --git a/common/lib/xmodule/xmodule/js/js_test.yml b/common/lib/xmodule/xmodule/js/js_test.yml
index 515101ab03fbbdf6cf7b0c694a798578b4e35a66..d9e4e9ec567c1d247e2eefb7701b30593c8be0f6 100644
--- a/common/lib/xmodule/xmodule/js/js_test.yml
+++ b/common/lib/xmodule/xmodule/js/js_test.yml
@@ -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/common/js/vendor/backbone-min.js
+ - common_static/common/js/vendor/backbone.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
diff --git a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
index 5ec46545ce7f491f546bab26fc1eec99580b3552..c0067fc257fcca4eb1b6a5517b5685a5807e1662 100644
--- a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
+++ b/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
@@ -45,7 +45,7 @@ var libraryFiles = [
{pattern: 'common_static/js/vendor/jquery.cookie.js', included: true},
{pattern: 'common_static/js/vendor/json2.js', included: true},
{pattern: 'common_static/common/js/vendor/underscore.js', included: true},
- {pattern: 'common_static/common/js/vendor/backbone-min.js', included: true},
+ {pattern: 'common_static/common/js/vendor/backbone.js', included: true},
{pattern: 'common_static/js/vendor/jquery.leanModal.js', included: true},
{pattern: 'common_static/js/vendor/CodeMirror/codemirror.js', included: true},
{pattern: 'common_static/js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js', included: true},
diff --git a/common/static/coffee/src/discussion/views/discussion_thread_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_view.coffee
index 9f092fd686dc162283fbeffec1ff743aaeb4d781..67c5c8c74dd3739c68c81525a14ee14293c69e45 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_view.coffee
@@ -20,7 +20,7 @@ if Backbone?
super()
@mode = options.mode or "inline" # allowed values are "tab" or "inline"
@context = options.context or "course" # allowed values are "course" or "standalone"
- @course_settings = options.course_settings
+ @options = _.extend({}, options)
if @mode not in ["tab", "inline"]
throw new Error("invalid mode: " + @mode)
@@ -47,7 +47,7 @@ if Backbone?
mode: @mode
model: @model
el: @el
- course_settings: @course_settings
+ course_settings: @options.course_settings
topicId: @topicId
)
@render()
@@ -308,7 +308,7 @@ if Backbone?
model: @model
mode: @mode
context: @context
- course_settings: @course_settings
+ course_settings: @options.course_settings
)
@editView.bind "thread:updated thread:cancel_edit", @closeEditView
@editView.bind "comment:endorse", @endorseThread
diff --git a/common/static/common/js/spec/main_requirejs.js b/common/static/common/js/spec/main_requirejs.js
index c6fb079f91be9812cdb893ee27dee13202cc4ace..eebe0a92b0a16ce005d6c77d748987c72cc7c445 100644
--- a/common/static/common/js/spec/main_requirejs.js
+++ b/common/static/common/js/spec/main_requirejs.js
@@ -25,7 +25,7 @@
'text': 'js/vendor/requirejs/text',
'underscore': 'common/js/vendor/underscore',
'underscore.string': 'common/js/vendor/underscore.string',
- 'backbone': 'common/js/vendor/backbone-min',
+ 'backbone': 'common/js/vendor/backbone',
'backbone.associations': 'js/vendor/backbone-associations-min',
'backbone.paginator': 'js/vendor/backbone.paginator.min',
'backbone-super': 'js/vendor/backbone-super',
diff --git a/common/static/js_test.yml b/common/static/js_test.yml
index 2cf1bed7c0151f1c9ed788fd9f62fc4a5ea504e1..cc7a0629afd48e9d13b7c78b5ca2e5f28de9c2ff 100644
--- a/common/static/js_test.yml
+++ b/common/static/js_test.yml
@@ -35,7 +35,7 @@ lib_paths:
- js/vendor/mustache.js
- common/js/vendor/underscore.js
- common/js/vendor/underscore.string.js
- - common/js/vendor/backbone-min.js
+ - common/js/vendor/backbone.js
- js/vendor/jquery.timeago.js
- js/vendor/URI.min.js
- js/vendor/draggabilly.js
diff --git a/common/static/js_test_requirejs.yml b/common/static/js_test_requirejs.yml
index c0a5a8ac410d14ce296fbec41b4ace60d0d01614..b687c1bec7758c19d8e415b0dc8c244dfc32873d 100644
--- a/common/static/js_test_requirejs.yml
+++ b/common/static/js_test_requirejs.yml
@@ -36,7 +36,7 @@ lib_paths:
- js/vendor/jquery.truncate.js
- common/js/vendor/underscore.js
- common/js/vendor/underscore.string.js
- - common/js/vendor/backbone-min.js
+ - common/js/vendor/backbone.js
- js/vendor/backbone.paginator.min.js
- js/vendor/jquery.timeago.js
- js/vendor/URI.min.js
diff --git a/common/static/karma_common.conf.js b/common/static/karma_common.conf.js
index 259ee5e640f15ff8aad7c596e96f18e36b3bd3e4..e0fda8d5157830b64cee9673ad3bc85e8584ec43 100644
--- a/common/static/karma_common.conf.js
+++ b/common/static/karma_common.conf.js
@@ -39,7 +39,7 @@ var libraryFiles = [
{pattern: 'js/vendor/mustache.js', included: true},
{pattern: 'common/js/vendor/underscore.js', included: true},
{pattern: 'common/js/vendor/underscore.string.js', included: true},
- {pattern: 'common/js/vendor/backbone-min.js', included: true},
+ {pattern: 'common/js/vendor/backbone.js', included: true},
{pattern: 'js/vendor/jquery.timeago.js', included: true},
{pattern: 'js/vendor/URI.min.js', included: true},
{pattern: 'coffee/src/ajax_prefix.js', included: true},
diff --git a/common/static/karma_common_requirejs.conf.js b/common/static/karma_common_requirejs.conf.js
index 60255e52c886198d4de381ee225f1949ca1734dd..475d869d3c909be435a69635e2a041090d0de931 100644
--- a/common/static/karma_common_requirejs.conf.js
+++ b/common/static/karma_common_requirejs.conf.js
@@ -37,7 +37,7 @@ var libraryFiles = [
{pattern: 'js/vendor/jquery.truncate.js', included: false},
{pattern: 'common/js/vendor/underscore.js', included: false},
{pattern: 'common/js/vendor/underscore.string.js', included: false},
- {pattern: 'common/js/vendor/backbone-min.js', included: false},
+ {pattern: 'common/js/vendor/backbone.js', included: false},
{pattern: 'js/vendor/backbone.paginator.min.js', included: false},
{pattern: 'js/vendor/jquery.timeago.js', included: false},
{pattern: 'js/vendor/URI.min.js', included: false},
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 5642dd2f837a0f0f91e3d8765f7411eafbcf3c87..974be247e14933358591070506ea901d34b7508e 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1260,7 +1260,7 @@ base_vendor_js = [
'js/vendor/requirejs/require.js',
'js/RequireJS-namespace-undefine.js',
'js/vendor/URI.min.js',
- 'common/js/vendor/backbone-min.js',
+ 'common/js/vendor/backbone.js',
'edx-pattern-library/js/modernizr-custom.js',
]
diff --git a/lms/static/js/spec/main.js b/lms/static/js/spec/main.js
index 709ec8434006f3966b882a584ec9809d5c807a76..2439da0eb87fc7fc04b1233dae9d3380b29d973a 100644
--- a/lms/static/js/spec/main.js
+++ b/lms/static/js/spec/main.js
@@ -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/common/js/vendor/backbone-min',
+ 'backbone': 'xmodule_js/common_static/common/js/vendor/backbone',
'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',
diff --git a/lms/static/js_test.yml b/lms/static/js_test.yml
index 7b025f2577259fb2f5399feeb29a31d514a67235..1385b225dafa54ef99c560ff83a71ae28b0cf22d 100644
--- a/lms/static/js_test.yml
+++ b/lms/static/js_test.yml
@@ -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/common/js/vendor/backbone-min.js
+ - xmodule_js/common_static/common/js/vendor/backbone.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
diff --git a/lms/static/karma_lms.conf.js b/lms/static/karma_lms.conf.js
index b310c7e337abd51300609965834f011dd9bb98ba..9f8efa3caa7abd627c182ba041fc7259161b3bd1 100644
--- a/lms/static/karma_lms.conf.js
+++ b/lms/static/karma_lms.conf.js
@@ -61,7 +61,7 @@ var libraryFiles = [
{pattern: 'xmodule_js/common_static/js/src/**/*.js', included: false},
{pattern: 'xmodule_js/common_static/common/js/vendor/underscore.js', included: false},
{pattern: 'xmodule_js/common_static/common/js/vendor/underscore.string.js', included: false},
- {pattern: 'xmodule_js/common_static/common/js/vendor/backbone-min.js', included: false},
+ {pattern: 'xmodule_js/common_static/common/js/vendor/backbone.js', included: false},
{pattern: 'xmodule_js/common_static/js/vendor/backbone.paginator.min.js', included: false},
{pattern: 'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min.js', included: false},
{pattern: 'xmodule_js/common_static/js/test/i18n.js', included: false},
diff --git a/lms/static/lms/js/require-config.js b/lms/static/lms/js/require-config.js
index 5d5dc80f756a83b8ab6a0e3bad51d626781e9166..e9a880e8743a029565f2b475e555ae7575b4732e 100644
--- a/lms/static/lms/js/require-config.js
+++ b/lms/static/lms/js/require-config.js
@@ -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": "common/js/vendor/backbone-min",
+ "backbone": "common/js/vendor/backbone",
"backbone-super": "js/vendor/backbone-super",
"backbone.paginator": "js/vendor/backbone.paginator.min",
"underscore": "common/js/vendor/underscore",
diff --git a/lms/templates/ccx/schedule.html b/lms/templates/ccx/schedule.html
index 8e3802f74fe890a6759b6bacd48a36a8a4aea8c3..049eca29b9d6dd1be7eae5b4f0d3234b18716a52 100644
--- a/lms/templates/ccx/schedule.html
+++ b/lms/templates/ccx/schedule.html
@@ -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('common/js/vendor/backbone-min.js')}"></script>
+ <script src="${static.url('common/js/vendor/backbone.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>
diff --git a/pavelib/assets.py b/pavelib/assets.py
index 28eda124cfb5240c0b43d1e297a089b4cf780c2a..03d80fa5a5dc1d84c3e624c8300abc5d7c7b7378 100644
--- a/pavelib/assets.py
+++ b/pavelib/assets.py
@@ -48,7 +48,7 @@ NPM_INSTALLED_LIBRARIES = [
'underscore/underscore.js',
'underscore.string/dist/underscore.string.js',
'picturefill/dist/picturefill.js',
- 'backbone/backbone-min.js',
+ 'backbone/backbone.js',
]
# Directory to install static vendor files