From ec13349ae37adc543152726bfee16a2e83bab34b Mon Sep 17 00:00:00 2001 From: Peter Fogg Date: Tue, 2 Jul 2013 09:05:48 -0400 Subject: [PATCH] Remove outdated deleteKeys from advanced settings. --- cms/static/js/models/settings/advanced.js | 26 ------------------- cms/static/js/views/settings/advanced_view.js | 8 +----- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/cms/static/js/models/settings/advanced.js b/cms/static/js/models/settings/advanced.js index fee89296a6..95fc64f2a0 100644 --- a/cms/static/js/models/settings/advanced.js +++ b/cms/static/js/models/settings/advanced.js @@ -5,8 +5,6 @@ CMS.Models.Settings.Advanced = Backbone.Model.extend({ defaults: { // the properties are whatever the user types in (in addition to whatever comes originally from the server) }, - // which keys to send as the deleted keys on next save - deleteKeys : [], validate: function (attrs) { // Keys can no longer be edited. We are currently not validating values. @@ -18,32 +16,8 @@ CMS.Models.Settings.Advanced = Backbone.Model.extend({ // add saveSuccess to the success var success = options.success; options.success = function(model, resp, options) { - model.afterSave(model); if (success) success(model, resp, options); }; Backbone.Model.prototype.save.call(this, attrs, options); - }, - - afterSave : function(self) { - // remove deleted attrs - if (!_.isEmpty(self.deleteKeys)) { - // remove the to be deleted keys from the returned model - _.each(self.deleteKeys, function(key) { self.unset(key); }); - // not able to do via backbone since we're not destroying the model - $.ajax({ - url : self.url, - // json to and fro - contentType : "application/json", - dataType : "json", - // delete - type : 'DELETE', - // data - data : JSON.stringify({ deleteKeys : self.deleteKeys}) - }) - .done(function(data, status, error) { - // clear deleteKeys on success - self.deleteKeys = []; - }); - } } }); diff --git a/cms/static/js/views/settings/advanced_view.js b/cms/static/js/views/settings/advanced_view.js index 65aed2a3c8..961d9d010b 100644 --- a/cms/static/js/views/settings/advanced_view.js +++ b/cms/static/js/views/settings/advanced_view.js @@ -61,13 +61,7 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({ var message = gettext("Your changes will not take effect until you save your progress. Take care with key and value formatting, as validation is not implemented."); self.showNotificationBar(message, _.bind(self.saveView, self), - function() { - self.model.deleteKeys = []; - self.revertView(); - }); - if(self.saved) { - self.saved.hide(); - } + _.bind(self.revertView, self)); } }, onFocus : function(mirror) {