Merge pull request #12037 from edx/fedx/upgrade-backbone

Upgrade backbone via npm.

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

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

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

cms/static/coffee/src/views/tabs.coffee

-define ["jquery", "jquery.ui", "backbone", "common/js/components/views/feedback_prompt",
+define ["underscore", "jquery", "jquery.ui", "backbone", "common/js/components/views/feedback_prompt",
         "common/js/components/views/feedback_notification", "coffee/src/views/module_edit", "js/models/module_info", "js/utils/module"],
-($, ui, Backbone, PromptView, NotificationView, ModuleEditView, ModuleModel, ModuleUtils) ->
+(_, $, ui, Backbone, PromptView, NotificationView, ModuleEditView, ModuleModel, ModuleUtils) ->
   class TabsEdit extends Backbone.View
 
-    initialize: =>
+    initialize: (options) =>
       @$('.component').each((idx, element) =>
           model = new ModuleModel({
               id: $(element).data('locator')
@@ -15,7 +15,7 @@ define ["jquery", "jquery.ui", "backbone", "common/js/components/views/feedback_
               model: model
           )
       )
-
+      @options = _.extend({}, options)
       @options.mast.find('.new-tab').on('click', @addNewTab)
       $('.add-pages .new-tab').on('click', @addNewTab)
       $('.toggle-checkbox').on('click', @toggleVisibilityOfTab)

cms/static/js/views/baseview.js

@@ -26,6 +26,14 @@ define(["jquery", "underscore", "backbone", "gettext", "js/utils/handle_iframe_b
             //override the constructor function
             constructor: function(options) {
                 _.bindAll(this, 'beforeRender', 'render', 'afterRender');
+
+                // Merge passed options and view's options property and
+                // attach to the view's options property
+                if (this.options) {
+                    options = _.extend({}, _.result(this, 'options'), options);
+                }
+                this.options = options;
+
                 var _this = this;
                 this.render = _.wrap(this.render, function (render, options) {
                     _this.beforeRender();

cms/static/js/views/manage_users_and_roles.js

@@ -100,8 +100,8 @@ define(['jquery', 'underscore', 'gettext', "js/views/baseview",
                 };
                 var roleEvents = {};
                 var self = this;
-                for (var i = 0; i < self.roles.length; i++) {
-                    var role_name = self.roles[i].key;
+                for (var i = 0; i < self.options.roles.length; i++) {
+                    var role_name = self.options.roles[i].key;
                     var role_selector = 'click .user-actions .make-' + role_name;
 
                     (function (role) {

cms/static/js/views/modals/base_modal.js

@@ -26,7 +26,7 @@ define(["jquery", "underscore", "gettext", "js/views/baseview"],
                 'click .action-cancel': 'cancel'
             },
 
-            options: $.extend({}, BaseView.prototype.options, {
+            options: _.extend({}, BaseView.prototype.options, {
                 type: 'prompt',
                 closeIcon: false,
                 icon: false,

cms/static/js/views/modals/course_outline_modals.js

@@ -17,9 +17,9 @@ define(['jquery', 'backbone', 'underscore', 'gettext', 'js/views/baseview',
         VerificationAccessEditor, TimedExaminationPreferenceEditor, AccessEditor;
 
     CourseOutlineXBlockModal = BaseModal.extend({
-        events : {
+        events : _.extend({}, BaseModal.prototype.events, {
             'click .action-save': 'save'
-        },
+        }),
 
         options: $.extend({}, BaseModal.prototype.options, {
             modalName: 'course-outline',
@@ -32,7 +32,6 @@ define(['jquery', 'backbone', 'underscore', 'gettext', 'js/views/baseview',
 
         initialize: function() {
             BaseModal.prototype.initialize.call(this);
-            this.events = $.extend({}, BaseModal.prototype.events, this.events);
             this.template = this.loadTemplate('course-outline-modal');
             this.options.title = this.getTitle();
         },
@@ -154,10 +153,10 @@ define(['jquery', 'backbone', 'underscore', 'gettext', 'js/views/baseview',
             }
         },
 
-        events: {
+        events: _.extend({}, CourseOutlineXBlockModal.prototype.events, {
             'click .action-save': 'save',
-            'click .settings-tab-button': 'handleShowTab',
-        },
+            'click .settings-tab-button': 'handleShowTab'
+        }),
 
         /**
          * Return request data.
@@ -185,9 +184,9 @@ define(['jquery', 'backbone', 'underscore', 'gettext', 'js/views/baseview',
 
 
     PublishXBlockModal = CourseOutlineXBlockModal.extend({
-        events : {
+        events : _.extend({}, CourseOutlineXBlockModal.prototype.events, {
             'click .action-publish': 'save'
-        },
+        }),
 
         initialize: function() {
             CourseOutlineXBlockModal.prototype.initialize.call(this);

cms/static/js/views/modals/edit_xblock.js

@@ -9,10 +9,10 @@ define(["jquery", "underscore", "gettext", "js/views/modals/base_modal", "common
         "strict mode";
 
         var EditXBlockModal = BaseModal.extend({
-            events : {
+            events: _.extend({}, BaseModal.prototype.events, {
                 "click .action-save": "save",
                 "click .action-modes a": "changeMode"
-            },
+            }),
 
             options: $.extend({}, BaseModal.prototype.options, {
                 modalName: 'edit-xblock',
@@ -25,7 +25,6 @@ define(["jquery", "underscore", "gettext", "js/views/modals/base_modal", "common
 
             initialize: function() {
                 BaseModal.prototype.initialize.call(this);
-                this.events = _.extend({}, BaseModal.prototype.events, this.events);
                 this.template = this.loadTemplate('edit-xblock-modal');
                 this.editorModeButtonTemplate = this.loadTemplate('editor-mode-button');
             },

cms/static/js/views/modals/validation_error_modal.js

@@ -38,7 +38,7 @@ define(['jquery', 'underscore', 'gettext', 'js/views/modals/base_modal'],
 
                 return this.template({
                     response: this.response,
-                    num_errors: this.response.length,
+                    num_errors: this.response.length
                 });
             },
 
@@ -57,7 +57,7 @@ define(['jquery', 'underscore', 'gettext', 'js/views/modals/base_modal'],
 
                 // hide the modal
                 BaseModal.prototype.hide.call(this); 
-            },
+            }
         });
 
         return ValidationErrorModal;

cms/static/js/views/pages/paged_container.js

@@ -6,12 +6,14 @@ define(["jquery", "underscore", "gettext", "js/views/pages/container", "js/views
         'use strict';
         var PagedXBlockContainerPage = XBlockContainerPage.extend({
 
-            events: {"click .toggle-preview-button": "toggleChildrenPreviews"},
+            events: _.extend({}, XBlockContainerPage.prototype.events, {
+                'click .toggle-preview-button': 'toggleChildrenPreviews'
+            }),
+
             defaultViewClass: PagedContainerView,
             components_on_init: false,
 
-            initialize: function (options){
-                this.events = _.extend({}, XBlockContainerPage.prototype.events, this.events);
+            initialize: function (options) {
                 this.page_size = options.page_size || 10;
                 this.showChildrenPreviews = options.showChildrenPreviews || true;
                 XBlockContainerPage.prototype.initialize.call(this, options);

cms/static/js/views/uploads.js

 define(["jquery", "underscore", "gettext", "js/views/modals/base_modal", "jquery.form"],
     function($, _, gettext, BaseModal) {
         var UploadDialog = BaseModal.extend({
-            events: {
+            events: _.extend({}, BaseModal.prototype.events, {
                 "change input[type=file]": "selectFile",
                 "click .action-upload": "upload"
-            },
+            }),
 
             options: $.extend({}, BaseModal.prototype.options, {
                 modalName: 'assetupload',
@@ -15,7 +15,6 @@ define(["jquery", "underscore", "gettext", "js/views/modals/base_modal", "jquery
 
             initialize: function() {
                 BaseModal.prototype.initialize.call(this);
-                this.events = _.extend({}, BaseModal.prototype.events, this.events);
                 this.template = this.loadTemplate("upload-dialog");
                 this.listenTo(this.model, "change", this.renderContents);
                 this.options.title = this.model.get('title');

cms/static/js/views/video/transcripts/file_uploader.js

@@ -17,11 +17,11 @@ function($, Backbone, _, Utils) {
 
         uploadTpl: '#file-upload',
 
-        initialize: function () {
+        initialize: function (options) {
             _.bindAll(this,
                 'changeHandler', 'clickHandler', 'xhrResetProgressBar', 'xhrProgressHandler', 'xhrCompleteHandler'
             );
-
+            this.options = _.extend({}, options);
             this.file = false;
             this.render();
         },

cms/static/js/views/video/transcripts/message_manager.js

@@ -28,11 +28,13 @@ function($, Backbone, _, Utils, FileUploader, gettext) {
             choose: '#transcripts-choose'
         },
 
-        initialize: function () {
+        initialize: function (options) {
             _.bindAll(this,
                 'importHandler', 'replaceHandler', 'chooseHandler', 'useExistingHandler', 'showError', 'hideError'
             );
 
+            this.options = _.extend({}, options);
+
             this.component_locator = this.$el.closest('[data-locator]').data('locator');
 
             this.fileUploader = new FileUploader({

cms/static/js/views/video/transcripts/metadata_videolist.js

@@ -25,9 +25,10 @@ function($, Backbone, _, AbstractEditor, Utils, MessageManager) {
             'youtube': 'http://youtube.com/'
         },
 
-        initialize: function () {
+        initialize: function (options) {
             // Initialize MessageManager that is responsible for
             // status messages and errors.
+            this.options = _.extend({}, options);
             var Messenger = this.options.MessageManager || MessageManager;
 
             this.messenger = new Messenger({

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

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

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/js/vendor/backbone-min.js', included: false},
+    {pattern: 'xmodule_js/common_static/common/js/vendor/backbone-min.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},

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/js/vendor/backbone-min.js', included: false},
+    {pattern: 'xmodule_js/common_static/common/js/vendor/backbone-min.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},

common/djangoapps/pipeline_mako/tests/test_render.py

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

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

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/js/vendor/backbone-min.js', included: true},
+    {pattern: 'common_static/common/js/vendor/backbone-min.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},

common/static/coffee/src/discussion/views/discussion_thread_view.coffee

@@ -20,6 +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
       if @mode not in ["tab", "inline"]
         throw new Error("invalid mode: " + @mode)
 
@@ -307,7 +308,7 @@ if Backbone?
         model: @model
         mode: @mode
         context: @context
-        course_settings: @options.course_settings
+        course_settings: @course_settings
       )
       @editView.bind "thread:updated thread:cancel_edit", @closeEditView
       @editView.bind "comment:endorse", @endorseThread

common/static/common/js/components/collections/paging_collection.js

@@ -20,7 +20,12 @@
     'use strict';
     define(['backbone.paginator'], function (BackbonePaginator) {
         var PagingCollection = BackbonePaginator.requestPager.extend({
-            initialize: function () {
+            initialize: function (models, options) {
+                options = options || {};
+                if (options.url) {
+                    this.url = options.url;
+                }
+
                 var self = this;
                 // These must be initialized in the constructor because otherwise all PagingCollections would point
                 // to the same object references for sortableFields and filterableFields.

common/static/common/js/components/views/feedback.js

@@ -59,7 +59,8 @@
                 */
                 },
 
-                initialize: function() {
+                initialize: function(options) {
+                    this.options = _.extend({}, this.options, options);
                     if (!this.options.type) {
                         throw "SystemFeedback: type required (given " +
                             JSON.stringify(this.options) + ")";

common/static/common/js/components/views/paginated_view.js

@@ -31,7 +31,7 @@
                     className: this.type  + '-container',
                     itemViewClass: this.itemViewClass
                 });
-                this.listView = new ItemListView({collection: this.options.collection});
+                this.listView = new ItemListView({collection: this.collection});
                 this.headerView = this.createHeaderView();
                 this.footerView = this.createFooterView();
                 this.collection.on('page_changed', function () {
@@ -46,12 +46,12 @@
             paginationLabel: gettext("Pagination"),
 
             createHeaderView: function() {
-                return new PagingHeader({collection: this.options.collection, srInfo: this.srInfo});
+                return new PagingHeader({collection: this.collection, srInfo: this.srInfo});
             },
 
             createFooterView: function() {
                 return new PagingFooter({
-                    collection: this.options.collection, hideWhenOnePage: true,
+                    collection: this.collection, hideWhenOnePage: true,
                     paginationLabel: this.paginationLabel
                 });
             },

common/static/common/js/spec/components/search_field_spec.js

@@ -21,8 +21,7 @@ define([
                     current_page: 1,
                     start: 0,
                     results: _.first(results, perPage)
-                },
-                {parse: true}
+                }
             );
             collection.start = 0;
             collection.totalCount = results.length;

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

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

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

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: 'js/vendor/backbone-min.js', included: true},
+    {pattern: 'common/js/vendor/backbone-min.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},

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: 'js/vendor/backbone-min.js', included: false},
+    {pattern: 'common/js/vendor/backbone-min.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},

lms/djangoapps/teams/static/teams/js/collections/base.js

@@ -4,6 +4,8 @@
         function(PagingCollection) {
             var BaseCollection = PagingCollection.extend({
                 initialize: function(options) {
+                    this.url = options.url;
+
                     PagingCollection.prototype.initialize.call(this);
 
                     this.course_id = options.course_id;

lms/djangoapps/teams/static/teams/js/collections/my_teams.js

@@ -3,6 +3,7 @@
     define(['teams/js/collections/team'], function (TeamCollection) {
         var MyTeamsCollection = TeamCollection.extend({
             initialize: function (teams, options) {
+                this.url = options.url;
                 TeamCollection.prototype.initialize.call(this, teams, options);
                 delete this.server_api.topic_id;
                 this.server_api = _.extend(this.server_api, {

lms/djangoapps/teams/static/teams/js/collections/team.js

@@ -6,6 +6,7 @@
                 sortField: 'last_activity_at',
 
                 initialize: function(teams, options) {
+                    this.url = options.url;
                     var self = this;
                     BaseCollection.prototype.initialize.call(this, options);
 

lms/djangoapps/teams/static/teams/js/collections/team_membership.js

@@ -4,6 +4,7 @@
         function(BaseCollection, TeamMembershipModel) {
             var TeamMembershipCollection = BaseCollection.extend({
                 initialize: function(team_memberships, options) {
+                    this.url = options.url;
                     var self = this;
                     BaseCollection.prototype.initialize.call(this, options);
 

lms/djangoapps/teams/static/teams/js/collections/topic.js

@@ -4,6 +4,7 @@
         function(_, gettext, BaseCollection, TopicModel) {
             var TopicCollection = BaseCollection.extend({
                 initialize: function(topics, options) {
+
                     var self = this;
 
                     BaseCollection.prototype.initialize.call(this, options);

lms/djangoapps/teams/static/teams/js/views/edit_team_members.js

@@ -22,6 +22,7 @@
                 },
 
                 initialize: function(options) {
+                    this.options = _.extend({}, options);
                     // The URL ends with team_id,request_username. We want to replace
                     // the last occurrence of team_id with the actual team_id, and remove request_username
                     // as the actual user to be removed from the team will be added on before calling DELETE.

lms/djangoapps/teams/static/teams/js/views/topic_teams.js

@@ -15,6 +15,7 @@
                 },
 
                 initialize: function(options) {
+                    this.options = _.extend({}, options);
                     this.showSortControls = options.showSortControls;
                     this.context = options.context;
                     this.myTeamsCollection = options.myTeamsCollection;

lms/djangoapps/teams/static/teams/js/views/topics.js

@@ -16,6 +16,7 @@
             },
 
             initialize: function (options) {
+                this.options = _.extend({}, options);
                 this.itemViewClass = TopicCardView.extend({
                     router: options.router,
                     srInfo: this.srInfo

lms/envs/common.py

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

lms/static/js/certificates/collections/certificate_invalidation_collection.js

@@ -9,7 +9,11 @@
 
         function(Backbone, CertificateInvalidation) {
             return Backbone.Collection.extend({
-                model: CertificateInvalidation
+                model: CertificateInvalidation,
+
+                initialize: function(models, options) {
+                    this.url = options.url;
+                }
             });
         }
     );

lms/static/js/certificates/collections/certificate_whitelist.js

@@ -15,6 +15,7 @@
                 model: CertificateExceptionModel,
 
                 initialize: function(attrs, options){
+                    this.url = options.url;
                     this.generate_certificates_url = options.generate_certificates_url;
                 },
 

lms/static/js/certificates/models/certificate_invalidation.js

@@ -19,8 +19,8 @@
                     notes: ''
                 },
 
-                url: function() {
-                    return this.get('url');
+                initialize: function (attributes, options) {
+                    this.url = options.url;
                 },
 
                 validate: function(attrs) {

lms/static/js/certificates/views/certificate_invalidation_view.js

@@ -35,11 +35,15 @@
                     var notes = this.$("#certificate-invalidation-notes").val();
                     var message = "";
 
-                    var certificate_invalidation = new CertificateInvalidationModel({
-                        url: this.collection.url,
-                        user: user,
-                        notes: notes
-                    });
+                    var certificate_invalidation = new CertificateInvalidationModel(
+                        {
+                            user: user,
+                            notes: notes
+                        },
+                        {
+                            url: this.collection.url
+                        }
+                    );
 
                     if (this.collection.findWhere({user: user})) {
                         message = gettext("Certificate of <%= user %> has already been invalidated. Please check your spelling and retry."); // jshint ignore:line

lms/static/js/edxnotes/collections/notes.js

@@ -9,6 +9,7 @@ define([
         initialize: function(models, options) {
             PagingCollection.prototype.initialize.call(this);
 
+            this.url = options.url;
             this.perPage = options.perPage;
             this.server_api = _.pick(this.server_api, "page", "page_size");
             if (options.text) {

lms/static/js/edxnotes/views/note_group.js

@@ -11,7 +11,8 @@ define([
             return 'note-section-' + _.uniqueId();
         },
 
-        initialize: function () {
+        initialize: function (options) {
+            this.options = _.extend({}, options);
             this.template = _.template(this.options.template);
             this.className = this.options.className;
         },
@@ -37,8 +38,9 @@ define([
         },
         template: _.template('<h3 class="course-title"><%- chapterName %></h3>'),
 
-        initialize: function () {
+        initialize: function (options) {
             this.children = [];
+            this.options = _.extend({}, options);
         },
 
         render: function () {

lms/static/js/edxnotes/views/note_item.js

@@ -17,6 +17,7 @@ define([
         },
 
         initialize: function (options) {
+            this.options = _.extend({}, options);
             this.template = templateUtils.loadTemplate('note-item');
             this.logger = NotesLogger.getLogger('note_item', options.debug);
             this.listenTo(this.model, 'change:is_expanded', this.render);

lms/static/js/edxnotes/views/tab_panel.js

@@ -12,8 +12,9 @@ function (gettext, _, Backbone, NoteItemView, PagingHeaderView, PagingFooterView
             'tabindex': -1
         },
 
-        initialize: function () {
+        initialize: function (options) {
             this.children = [];
+            this.options = _.extend({}, options);
             if (this.options.createHeaderFooter) {
                 this.pagingHeaderView = new PagingHeaderView({collection: this.collection});
                 this.pagingFooterView = new PagingFooterView({collection: this.collection, hideWhenOnePage: true});

lms/static/js/edxnotes/views/tabs/search_results.js

@@ -52,6 +52,7 @@ define([
         },
 
         initialize: function (options) {
+            this.options = _.extend({}, options);
             _.bindAll(this, 'onBeforeSearchStart', 'onSearch', 'onSearchError');
             TabView.prototype.initialize.call(this, options);
             this.searchResults = null;

lms/static/js/edxnotes/views/tabs/tags.js

@@ -24,6 +24,7 @@ define([
         },
 
         initialize: function (options) {
+            this.options = _.extend({}, options);
             TabView.prototype.initialize.call(this, options);
             _.bindAll(this, 'scrollToTag');
             this.options.scrollToTag = this.scrollToTag;

lms/static/js/spec/instructor_dashboard/certificates_invalidation_spec.js

@@ -29,7 +29,7 @@ define([
 
             beforeEach(function() {
 
-                certificate_invalidation = new CertificateInvalidationModel({user: 'test_user'});
+                certificate_invalidation = new CertificateInvalidationModel({user: 'test_user'}, {url: 'test/url/'});
                 certificate_invalidation.set({
                     notes: "Test notes"
                 });
@@ -174,7 +174,9 @@ define([
             it("verifies view is rendered on add/remove to collection", function() {
                 var user = 'test3',
                     notes = 'test3 notes',
-                    model = new CertificateInvalidationModel({user: user, notes: notes});
+                    model = new CertificateInvalidationModel(
+                        {user: user, notes: notes}, {url: certificate_invalidation_url}
+                    );
 
                 // Add another model in collection and verify it is rendered
                 view.collection.add(model);

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

lms/static/js/spec/search/search_spec.js

@@ -654,6 +654,7 @@ define([
 
             function navigatesToSearch () {
                 var requests = AjaxHelpers.requests(this);
+                Backbone.history.start();
                 Backbone.history.loadUrl('search/query');
                 expect(requests[0].requestBody).toContain('search_string=query');
             }
@@ -687,6 +688,10 @@ define([
                     this.$searchResults = $('.courseware-results');
                 });
 
+                afterEach(function (){
+                    Backbone.history.stop();
+                });
+
                 it('shows loading message on search', showsLoadingMessage);
                 it('performs search', performsSearch);
                 it('shows an error message', showsErrorMessage);
@@ -715,6 +720,10 @@ define([
                     this.$searchResults = $('#dashboard-search-results');
                 });
 
+                afterEach(function (){
+                    Backbone.history.stop();
+                });
+
                 it('shows loading message on search', showsLoadingMessage);
                 it('performs search', performsSearch);
                 it('shows an error message', showsErrorMessage);

lms/static/js/student_account/views/account_settings_fields.js

@@ -49,6 +49,7 @@
         AccountSettingsFieldViews.PasswordFieldView = FieldViews.LinkFieldView.extend({
 
             initialize: function (options) {
+                this.options = _.extend({}, options);
                 this._super(options);
                 _.bindAll(this, 'resetPassword');
             },
@@ -111,6 +112,7 @@
         AccountSettingsFieldViews.AuthFieldView = FieldViews.LinkFieldView.extend({
 
             initialize: function (options) {
+                this.options = _.extend({}, options);
                 this._super(options);
                 _.bindAll(this, 'redirect_to', 'disconnect', 'successMessage', 'inProgressMessage');
             },

lms/static/js/student_account/views/account_settings_view.js

@@ -6,7 +6,8 @@
 
         var AccountSettingsView = Backbone.View.extend({
 
-            initialize: function () {
+            initialize: function (options) {
+                this.options = _.extend({}, options);
                 _.bindAll(this, 'render', 'renderFields', 'showLoadingError');
             },
 

lms/static/js/student_profile/views/badge_view.js

@@ -7,6 +7,7 @@
 
             var BadgeView = Backbone.View.extend({
                 initialize: function(options) {
+                    this.options = _.extend({}, options);
                     this.context = _.extend(this.options.model.toJSON(), {
                         'created': new Moment(this.options.model.toJSON().created),
                         'ownProfile': options.ownProfile,

lms/static/js/student_profile/views/learner_profile_view.js

@@ -9,7 +9,8 @@
 
         var LearnerProfileView = Backbone.View.extend({
 
-            initialize: function () {
+            initialize: function (options) {
+                this.options = _.extend({}, options);
                 _.bindAll(this, 'showFullProfile', 'render', 'renderFields', 'showLoadingError');
                 this.listenTo(this.options.preferencesModel, "change:" + 'account_privacy', this.render);
                 var Router = Backbone.Router.extend({

lms/static/js/student_profile/views/section_two_tab.js

@@ -9,6 +9,9 @@
                     'class': 'wrapper-profile-section-two'
                 },
                 template: _.template(sectionTwoTemplate),
+                initialize: function (options) {
+                    this.options = _.extend({}, options);
+                },
                 render: function () {
                     var self = this;
                     var showFullProfile = this.options.showFullProfile();

lms/static/js/student_profile/views/share_modal_view.js

@@ -17,6 +17,9 @@
                     'focus .focusguard-start': 'focusGuardStart',
                     'focus .focusguard-end': 'focusGuardEnd'
                 },
+                initialize: function (options) {
+                    this.options = _.extend({}, options);
+                },
                 focusGuardStart: function () {
                     // Should only be selected directly if shift-tabbing from the start, so grab last item.
                     this.$el.find("a").last().focus();

lms/static/js/views/fields.js

@@ -46,6 +46,11 @@
                 'success': gettext('Your changes have been saved.')
             },
 
+            constructor: function(options) {
+                this.options = _.extend({}, options);
+                Backbone.View.apply(this, arguments);
+            },
+
             initialize: function () {
 
                 this.template = _.template(this.fieldTemplate || '');

lms/static/js/views/image_field.js

@@ -38,6 +38,7 @@
             },
 
             initialize: function (options) {
+                this.options = _.extend({}, options);
                 this._super(options);
                 _.bindAll(this, 'render', 'imageChangeSucceeded', 'imageChangeFailed', 'fileSelected',
                           'watchForPageUnload', 'onBeforeUnload');

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

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/js/vendor/backbone-min.js', included: false},
+    {pattern: 'xmodule_js/common_static/common/js/vendor/backbone-min.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},

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

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

package.json

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

pavelib/assets.py

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