From 9b807765e6926b907c6a5311c7b0e7ba7b820342 Mon Sep 17 00:00:00 2001
From: Darren <darren@Darrens-MacBook-Pro.local>
Date: Sat, 25 May 2013 16:03:06 +0100
Subject: [PATCH] Client: Extending view events correctly. Fixes nick click
 events breaking mediamessages

---
 client/assets/src/views/channel.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/assets/src/views/channel.js b/client/assets/src/views/channel.js
index 0a005cc..21d630e 100644
--- a/client/assets/src/views/channel.js
+++ b/client/assets/src/views/channel.js
@@ -1,6 +1,13 @@
 _kiwi.view.Channel = _kiwi.view.Panel.extend({
-    events: {
-        'click .msg .nick': 'nickClick'
+    events: function(){
+        var parent_events = _kiwi.view.Panel.prototype.events;
+        
+        if(_.isFunction(parent_events)){
+            parent_events = parent_events();
+        }
+        return _.extend({}, parent_events, {
+            'click .msg .nick' : 'nickClick'
+        });
     },
 
     initialize: function (options) {
-- 
2.25.1