From 13337178715ebec8c9738afceef0297b11d9bab4 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Fri, 10 May 2013 14:43:14 -0400 Subject: [PATCH] Message action callbacks have model set to `this` --- cms/static/js/models/feedback.js | 7 ++++--- cms/static/js/views/feedback.js | 4 ++-- cms/templates/base.html | 4 ++-- cms/templates/overview.html | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/cms/static/js/models/feedback.js b/cms/static/js/models/feedback.js index 366582ecc1..1bd8f0b066 100644 --- a/cms/static/js/models/feedback.js +++ b/cms/static/js/models/feedback.js @@ -13,19 +13,20 @@ CMS.Models.SystemFeedback = Backbone.Model.extend({ "primary": { "text": "Save", "class": "action-save", - "click": function(model) { + "click": function() { // do something when Save is clicked + // `this` refers to the model } }, "secondary": [ { "text": "Cancel", "class": "action-cancel", - "click": function(model) {} + "click": function() {} }, { "text": "Discard Changes", "class": "action-discard", - "click": function(model) {} + "click": function() {} } ] } diff --git a/cms/static/js/views/feedback.js b/cms/static/js/views/feedback.js index a2f80c94aa..70100f53bd 100644 --- a/cms/static/js/views/feedback.js +++ b/cms/static/js/views/feedback.js @@ -26,7 +26,7 @@ CMS.Views.SystemFeedback = Backbone.View.extend({ primaryClick: function() { var primary = this.model.get("actions").primary; if(primary.click) { - primary.click(this.model); + primary.click.call(this.model); } }, secondaryClick: function(e) { @@ -38,7 +38,7 @@ CMS.Views.SystemFeedback = Backbone.View.extend({ var i = _.indexOf(this.$(".action-secondary"), e.target); var secondary = this.model.get("actions").secondary[i]; if(secondary.click) { - secondary.click(this.model); + secondary.click.call(this.model); } } }); diff --git a/cms/templates/base.html b/cms/templates/base.html index a13cd06150..d6de3f59ae 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -117,8 +117,8 @@ $(document).ajaxError(function(event, jqXHR, ajaxSettings, thrownError) { "actions": { "primary": { "text": "Dismiss", - "click": function(model) { - model.hide(); + "click": function() { + this.hide(); } } } diff --git a/cms/templates/overview.html b/cms/templates/overview.html index af61a3afe9..ee81f78288 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -248,8 +248,8 @@ CMS.Views.SectionEdit = Backbone.View.extend({ actions: { primary: { text: "Dismiss", - click: function(model) { - model.hide() + click: function() { + this.hide() } } }