Upgrade backbone via npm.

TNL-4335
2016-04-05 16:38:38 +05:00
parent d670f8c4da
commit e89a32d5c6
18 changed files with 20 additions and 19 deletions
--- 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': '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',
--- a/common/static/js/vendor/backbone-min.js
+++ b/common/static/js/vendor/backbone-min.js
--- 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
-    - 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
--- 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
-    - 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