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

Merge pull request #12289 from edx/mzfr/backbone-cleanup

Browse Source 
Replace backbone-min.js to backbone.js
This commit is contained in:
Ehtesham Kafeel
2016-04-29 16:53:02 +05:00
parent ea522a1797 928d9a2694
commit 8cf89d3a8e
23 changed files with 26 additions and 26 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": "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",

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/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",

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/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",

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/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

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/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

2
cms/static/karma_cms.conf.js
View File

@@ -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},

2
cms/static/karma_cms_squire.conf.js
View File

@@ -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},

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': '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);",

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/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

2
common/lib/xmodule/xmodule/js/karma_xmodule.conf.js
View File

@@ -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},

6
common/static/coffee/src/discussion/views/discussion_thread_view.coffee
View File

@@ -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

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': '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',

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
- 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

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
- 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

2
common/static/karma_common.conf.js
View File

@@ -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},

2
common/static/karma_common_requirejs.conf.js
View File

@@ -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},

2
lms/envs/common.py
View File

@@ -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',
]

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/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',

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/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

2
lms/static/karma_lms.conf.js
View File

@@ -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},

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": "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",

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('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>

2
pavelib/assets.py
View File

@@ -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