From 5d0ac36fa4637db6a47cc920203622456913ec71 Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev Date: Fri, 15 Feb 2013 10:49:13 +0000 Subject: [PATCH] Update close control view in Chat JavaScript application Rename close method to closeThread to not override Marionette.js View.close method. --- .../webim/js/compiled/chat/model_views/controls/close.js | 2 +- src/messenger/webim/js/compiled/chat_app.js | 2 +- .../webim/js/source/chat/model_views/controls/close.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/messenger/webim/js/compiled/chat/model_views/controls/close.js b/src/messenger/webim/js/compiled/chat/model_views/controls/close.js index 2717dac7..d50d809c 100644 --- a/src/messenger/webim/js/compiled/chat/model_views/controls/close.js +++ b/src/messenger/webim/js/compiled/chat/model_views/controls/close.js @@ -5,4 +5,4 @@ Copyright (c) 2005-2011 Mibew Messenger Community License: http://mibew.org/license.php */ -(function(a,c,d){a.Views.CloseControl=a.Views.Control.extend({template:c.templates.close_control,events:d.extend({},a.Views.Control.prototype.events,{click:"close"}),close:function(){var b=a.Localization.get("chat.close.confirmation");(!1===b||confirm(b))&&this.model.closeThread()}})})(Mibew,Handlebars,_); +(function(a,c,d){a.Views.CloseControl=a.Views.Control.extend({template:c.templates.close_control,events:d.extend({},a.Views.Control.prototype.events,{click:"closeThread"}),closeThread:function(){var b=a.Localization.get("chat.close.confirmation");(!1===b||confirm(b))&&this.model.closeThread()}})})(Mibew,Handlebars,_); diff --git a/src/messenger/webim/js/compiled/chat_app.js b/src/messenger/webim/js/compiled/chat_app.js index 6b5c490c..5ecdf644 100644 --- a/src/messenger/webim/js/compiled/chat_app.js +++ b/src/messenger/webim/js/compiled/chat_app.js @@ -145,7 +145,7 @@ c=b.Objects.Models.user;return[{"function":"updateMessages",arguments:{"return": Copyright (c) 2005-2011 Mibew Messenger Community License: http://mibew.org/license.php */ -(function(a,c,d){a.Views.CloseControl=a.Views.Control.extend({template:c.templates.close_control,events:d.extend({},a.Views.Control.prototype.events,{click:"close"}),close:function(){var b=a.Localization.get("chat.close.confirmation");(!1===b||confirm(b))&&this.model.closeThread()}})})(Mibew,Handlebars,_); +(function(a,c,d){a.Views.CloseControl=a.Views.Control.extend({template:c.templates.close_control,events:d.extend({},a.Views.Control.prototype.events,{click:"closeThread"}),closeThread:function(){var b=a.Localization.get("chat.close.confirmation");(!1===b||confirm(b))&&this.model.closeThread()}})})(Mibew,Handlebars,_); /* This file is part of Mibew Messenger project. http://mibew.org diff --git a/src/messenger/webim/js/source/chat/model_views/controls/close.js b/src/messenger/webim/js/source/chat/model_views/controls/close.js index 26fc97b8..60fdb45d 100644 --- a/src/messenger/webim/js/source/chat/model_views/controls/close.js +++ b/src/messenger/webim/js/source/chat/model_views/controls/close.js @@ -30,14 +30,14 @@ {}, Mibew.Views.Control.prototype.events, { - 'click': 'close' + 'click': 'closeThread' } ), /** * Display confirmation dialog and close chat window */ - close: function() { + closeThread: function() { // Show confirmation message if can var confirmMessage = Mibew.Localization.get('chat.close.confirmation'); if (confirmMessage !== false) {