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

LMS fixes required to upgrade BackboneJS

Browse Source
This commit is contained in:
muhammad-ammar
2016-04-19 18:34:46 +05:00
committed by Clinton Blackburn
parent eed09cc001
commit 762a6657fe
38 changed files with 85 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cms/static/coffee/src/views/tabs.coffee
View File

@@ -1,9 +1,9 @@
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)

4
cms/static/js/views/video/transcripts/file_uploader.js
View File

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

4
cms/static/js/views/video/transcripts/message_manager.js
View File

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

3
cms/static/js/views/video/transcripts/metadata_videolist.js
View File

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

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

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

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

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

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

2
lms/djangoapps/teams/static/teams/js/collections/base.js
View File

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

1
lms/djangoapps/teams/static/teams/js/collections/my_teams.js
View File

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

1
lms/djangoapps/teams/static/teams/js/collections/team.js
View File

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

1
lms/djangoapps/teams/static/teams/js/collections/team_membership.js
View File

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

1
lms/djangoapps/teams/static/teams/js/collections/topic.js
View File

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

1
lms/djangoapps/teams/static/teams/js/views/edit_team_members.js
View File

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

1
lms/djangoapps/teams/static/teams/js/views/topic_teams.js
View File

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

1
lms/djangoapps/teams/static/teams/js/views/topics.js
View File

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

6
lms/static/js/certificates/collections/certificate_invalidation_collection.js
View File

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

1
lms/static/js/certificates/collections/certificate_whitelist.js
View File

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

4
lms/static/js/certificates/models/certificate_invalidation.js
View File

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

14
lms/static/js/certificates/views/certificate_invalidation_view.js
View File

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

1
lms/static/js/edxnotes/collections/notes.js
View File

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

6
lms/static/js/edxnotes/views/note_group.js
View File

@@ -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 () {

1
lms/static/js/edxnotes/views/note_item.js
View File

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

3
lms/static/js/edxnotes/views/tab_panel.js
View File

@@ -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});

1
lms/static/js/edxnotes/views/tabs/search_results.js
View File

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

1
lms/static/js/edxnotes/views/tabs/tags.js
View File

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

6
lms/static/js/spec/instructor_dashboard/certificates_invalidation_spec.js
View File

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

9
lms/static/js/spec/search/search_spec.js
View File

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

2
lms/static/js/student_account/views/account_settings_fields.js
View File

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

3
lms/static/js/student_account/views/account_settings_view.js
View File

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

1
lms/static/js/student_profile/views/badge_view.js
View File

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

3
lms/static/js/student_profile/views/learner_profile_view.js
View File

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

3
lms/static/js/student_profile/views/section_two_tab.js
View File

@@ -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();

3
lms/static/js/student_profile/views/share_modal_view.js
View File

@@ -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();

5
lms/static/js/views/fields.js
View File

@@ -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 || '');

1
lms/static/js/views/image_field.js
View File

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

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