Channel member list functional, joins, parts, quits & channel user modes work, topic...

Overall, a lot more now works again!

diff --git a/client/js/front.events.js b/client/js/front.events.js
index e0d6a59b27a10a2a14187a7dd86bdee9c636713b..0fc3d63e9418bb26455ee153037c38efaae0256c 100755 (executable)
--- a/client/js/front.events.js
+++ b/client/js/front.events.js
@@ -117,6 +117,7 @@ kiwi.front.events = {
         });\r
         if (chan) {\r
             chan.set({"topic": data.topic});\r
+            chan.trigger("topic");\r
         }\r
     },\r
 \r
@@ -357,11 +358,6 @@ kiwi.front.events = {
     onMode: function (e, data) {\r
         var tab, mem;\r
         if ((typeof data.channel === 'string') && (typeof data.effected_nick === 'string')) {\r
-        //    tab = Tabview.getTab(data.channel);\r
-        //    tab.addMsg(null, ' ', '[' + data.mode + '] ' + data.effected_nick + ' by ' + data.nick, 'mode', '');\r
-        //    if (tab.userlist.hasUser(data.effected_nick)) {\r
-        //        tab.userlist.changeUserMode(data.effected_nick, data.mode.substr(1), (data.mode[0] === '+'));\r
-        //    }\r
             chan = kiwi.bbchans.detect(function (c) {\r
                 return c.get("name") === data.channel;\r
             });\r
@@ -388,27 +384,21 @@ kiwi.front.events = {
     */\r
     onUserList: function (e, data) {\r
         var tab, chan;\r
-\r
-        //tab = Tabview.getTab(data.channel);\r
-        //if (!tab) {\r
-        //    return;\r
-        //}\r
-\r
         chan = kiwi.bbchans.detect(function (c) {\r
             return c.get("name") === data.channel;\r
         });\r
-        if ((!kiwi.front.cache.userlist) || (!kiwi.front.cache.userlist.updating)) {\r
-            if (!kiwi.front.cache.userlist) {\r
-                kiwi.front.cache.userlist = {updating: true};\r
-            } else {\r
-                kiwi.front.cache.userlist.updating = true;\r
-            }\r
-            chan.get("members").reset();\r
-        }\r
-\r
-        //tab.userlist.addUser(data.users);\r
         if (chan) {\r
-            chan.get("members").add(data.users, {"silent": true});\r
+            if ((!kiwi.front.cache.userlist) || (!kiwi.front.cache.userlist.updating)) {\r
+                if (!kiwi.front.cache.userlist) {\r
+                    kiwi.front.cache.userlist = {updating: true};\r
+                } else {\r
+                    kiwi.front.cache.userlist.updating = true;\r
+                }\r
+                chan.get("members").reset([],{"silent": true});\r
+            }\r
+            _.forEach(data.users, function (u) {\r
+                chan.get("members").add(new kiwi.model.Member(u), {"silent": true});\r
+            });\r
         }\r
     },\r
     /**\r
@@ -417,6 +407,7 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data\r
     */\r
     onUserListEnd: function (e, data) {\r
+        var chan;\r
         if (!kiwi.front.cache.userlist) {\r
             kiwi.front.cache.userlist = {};\r
         }\r
@@ -479,30 +470,18 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data\r
     */\r
     onJoin: function (e, data) {\r
-        //var tab = Tabview.getTab(data.channel);\r
-        //if (!tab) {\r
-        //    tab = new Tabview(data.channel.toLowerCase());\r
-        //}\r
-\r
-        //tab.addMsg(null, ' ', '--> ' + data.nick + ' [' + data.ident + '@' + data.hostname + '] has joined', 'action join', 'color:#009900;');\r
-\r
+        var chan;\r
         chan = kiwi.bbchans.detect(function (c) {\r
             return c.get("name") === data.channel;\r
         });\r
         if (!chan) {\r
             chan = new kiwi.model.Channel({"name": data.channel.toLowerCase()});\r
-            chan.get("members").add(new kiwi.model.Member({"nick": data.nick, "modes": []}));\r
             kiwi.bbchans.add(chan);\r
+            // No need to add ourselves to the MemberList as RPL_NAMESREPLY will be next\r
         } else {\r
-            chan.get("members").add(data.users, {"silent": true});\r
+            chan.get("members").add(new kiwi.model.Member({"nick": data.nick, "modes": [], "ident": data.ident, "hostname": data.hostname}));\r
         }\r
         chan.view.show();\r
-\r
-        //if (data.nick === kiwi.gateway.nick) {\r
-        //    return; // Not needed as it's already in nicklist\r
-        //}\r
-\r
-        //tab.userlist.addUser({nick: data.nick, modes: []});\r
     },\r
     /**\r
     *   Handles the part event\r
@@ -510,19 +489,7 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data\r
     */\r
     onPart: function (e, data) {\r
-        var chan, members;\r
-        //var tab = Tabview.getTab(data.channel);\r
-        //if (tab) {\r
-            // If this is us, close the tabview\r
-        //    if (data.nick === kiwi.gateway.nick) {\r
-        //        tab.close();\r
-        //        Tabview.getServerTab().show();\r
-        //        return;\r
-        //    }\r
-\r
-        //    tab.addMsg(null, ' ', '<-- ' + data.nick + ' has left (' + data.message + ')', 'action part', 'color:#990000;');\r
-        //    tab.userlist.removeUser(data.nick);\r
-        //}\r
+        var chan, members, cid;\r
         chan = kiwi.bbchans.detect(function (c) {\r
             return c.get("name") === data.channel;\r
         });\r
@@ -530,11 +497,10 @@ kiwi.front.events = {
             if (data.nick === kiwi.gateway.nick) {\r
                 chan.trigger("close");\r
             } else {\r
-                chan.addMsg(null, ' ', '<-- ' + data.nick + ' has left (' + data.message + ')', 'action part', 'color:#990000;');\r
                 members = chan.get("members");\r
-                members.remove(_.detect(members, function (m) {\r
+                members.remove(members.detect(function (m) {\r
                     return data.nick === m.get("nick");\r
-                }));\r
+                }).cid, {"message": data.message})\r
             }\r
         }\r
     },\r
@@ -583,12 +549,17 @@ kiwi.front.events = {
     *   @param  {Object}        data    The event data\r
     */\r
     onQuit: function (e, data) {\r
-        //_.each(Tabview.getAllTabs(), function (tab) {\r
-        //    if (tab.userlist.hasUser(data.nick)) {\r
-        //        tab.userlist.removeUser(data.nick);\r
-        //        tab.addMsg(null, ' ', '<-- ' + data.nick + ' has quit (' + data.message + ')', 'action quit', 'color:#990000;');\r
-        //    }\r
-        //});\r
+        var chan, members, member;\r
+        kiwi.bbchans.forEach(function (chan) {\r
+            members = chan.get("members");\r
+            member = members.detect(function (m) {\r
+                return data.nick === m.get("nick");\r
+            });\r
+            if (member) {\r
+                members.trigger("quit", {"member": member, "message": data.message});\r
+                members.remove(member.cid);\r
+            }\r
+        });\r
     },\r
     /**\r
     *   Handles the channelRedirect event\r

diff --git a/client/js/front.ui.js b/client/js/front.ui.js
index e7d2eb49d761e5cf93542761926b70315eebe18c..feabb5135e54bf5d6b8da54d811d9340f51ed997 100755 (executable)
--- a/client/js/front.ui.js
+++ b/client/js/front.ui.js
@@ -396,7 +396,7 @@ kiwi.front.ui = {
                 return;\r
             }\r
             i++;\r
-        }*/\r
+        }\r
     },\r
 \r
 \r

diff --git a/client/js/model.js b/client/js/model.js
index d5d490abefcb3c330d6e173028b848d544e08239..4e01ae3c4f3c17b91f414f02c102d59707433a2b 100755 (executable)
--- a/client/js/model.js
+++ b/client/js/model.js
@@ -49,6 +49,9 @@ kiwi.model.MemberList = Backbone.Collection.extend({
             console.log('Something\'s gone wrong somewhere - two users have the same nick!');\r
             return 0;\r
         }\r
+    },\r
+    initialize: function (options) {\r
+        this.view = new kiwi.view.MemberList({"model": this, "name": options.name});\r
     }\r
 });\r
 \r
@@ -81,8 +84,7 @@ kiwi.model.Member = Backbone.Model.extend({
 \r
         modes = this.get("modes");\r
         modes = modes || [];\r
-        modes.sort(this.sortModes);\r
-\r
+        this.sortModes(modes);\r
         this.set({"nick": nick, "modes": modes, "prefix": this.getPrefix(modes)}, {silent: true});\r
     },\r
     addMode: function (mode) {\r
@@ -136,19 +138,31 @@ kiwi.model.ChannelList = Backbone.Collection.extend({
 // TODO: Channel modes\r
 kiwi.model.Channel = Backbone.Model.extend({\r
     initialize: function (attributes) {\r
-        var name = this.get("name") || "";\r
+        var name = this.get("name") || "",\r
+            members;\r
+        this.view = new kiwi.view.Channel({"model": this, "name": name});\r
         this.set({\r
-            "members": new kiwi.model.MemberList(),\r
+            "members": new kiwi.model.MemberList({"name": this.view.htmlsafe_name}),\r
             "name": name,\r
             "backscroll": [],\r
             "topic": ""\r
         }, {"silent": true});\r
-        this.view = new kiwi.view.Channel({"model": this, "name": name});\r
+        this.addMsg(null, ' ', '--> You have joined ' + name, 'action join', 'color:#009900;');\r
+        members = this.get("members");\r
+        members.bind("add", function (member) {\r
+            this.addMsg(null, ' ', '--> ' + member.get("nick") + ' [' + member.get("ident") + '@' + member.get("hostname") + '] has joined', 'action join', 'color:#009900;');\r
+        }, this);\r
+        members.bind("remove", function (member, options) {\r
+            this.addMsg(null, ' ', '<-- ' + member.get("nick") + ' has left ' + ((options.message) ? '(' + options.message + ')' : ''), 'action join', 'color:#009900;');\r
+        }, this);\r
+        members.bind("quit", function (args) {\r
+            this.addMsg(null, ' ', '<-- ' + args.member.get("nick") + ' has quit ' + ((args.message) ? '(' + args.message + ')' : ''), 'action join', 'color:#009900;');\r
+        }, this);\r
     },\r
     addMsg: function (time, nick, msg, type, style) {\r
         var tmp, bs;\r
 \r
-        tmp = {"msg": msg, "time": time, "nick": nick, "chan": this.get("name")};\r
+        tmp = {"msg": msg, "time": time, "nick": nick, "chan": this.get("name"), "style": style};\r
         tmp = kiwi.plugs.run('addmsg', tmp);\r
         if (!tmp) {\r
             return;\r

diff --git a/client/js/util.js b/client/js/util.js
index fde8b604ae3fb6be33fe91240c229b47c0e99e8a..c9f345f4417cc7634c9f7d54f73c8b9ef0e53919 100755 (executable)
--- a/client/js/util.js
+++ b/client/js/util.js
@@ -14,7 +14,7 @@ var kiwi = {};
 *   @param  {Boolean}   debug   Whether to re-enable console.log or not
 */
 function manageDebug(debug) {
-    var log, consoleBackUp;
+/*    var log, consoleBackUp;
     if (window.console) {
         consoleBackUp = window.console.log;
         window.console.log = function () {
@@ -30,7 +30,7 @@ function manageDebug(debug) {
                 log(str);
             }
         };
-    }
+    }*/
 }
 
 /**

diff --git a/client/js/view.js b/client/js/view.js
index ac2a83978afb28694382832315febafa2e28dcb4..6db6e7e500a7c847c7e9d804906666abb1031ad5 100755 (executable)
--- a/client/js/view.js
+++ b/client/js/view.js
@@ -10,17 +10,22 @@ kiwi.view.MemberList = Backbone.View.extend({
     },\r
     initialize: function (options) {\r
         $(this.el).attr("id", 'kiwi_userlist_' + options.name);\r
-        this.model.get("members").bind('change', this.render, this);\r
+        this.model.bind('all', this.render, this);\r
+        $(this.el).appendTo('#kiwi .userlist');\r
     },\r
     render: function () {\r
         var $this = $(this.el);\r
         $this.empty();\r
-        this.model.get("members").forEach(function (member) {\r
-            $this.append('<li><a class="nick"><span class="prefix">' + user.prefix + user.nick + '</a></li>');\r
+        this.model.forEach(function (member) {\r
+            $('<li><a class="nick"><span class="prefix">' + member.get("prefix") + '</span>' + member.get("nick") + '</a></li>').appendTo($this).data('member', member);\r
         });\r
     },\r
     nickClick: function (x) {\r
         console.log(x);\r
+    },\r
+    show: function () {\r
+        $('#kiwi .userlist').children().css('display', 'none');\r
+        $(this.el).css('display', 'block');\r
     }\r
 });\r
 \r
@@ -35,8 +40,10 @@ kiwi.view.Channel = Backbone.View.extend({
         $(this.el).attr("id", 'kiwi_window_' + this.htmlsafe_name).css('display', 'none');\r
         this.el = $(this.el).appendTo('#panel1 .scroller')[0];\r
         this.model.bind('msg', this.newMsg, this);\r
+        this.model.bind('topic', this.topic, this);\r
         this.msg_count = 0;\r
         this.model.set({"view": this}, {"silent": true});\r
+        this.visible = false;\r
     },\r
     render: function () {\r
         var $this = $(this.el);\r
@@ -44,6 +51,7 @@ kiwi.view.Channel = Backbone.View.extend({
         this.model.get("backscroll").forEach(this.newMsg);\r
     },\r
     newMsg: function (msg) {\r
+        // TODO: make sure that the message pane is scrolled to the bottom\r
         var re, line_msg, $this = $(this.el);\r
         // Make the channels clickable\r
         re = new RegExp('\\B(' + kiwi.gateway.channel_prefix + '[^ ,.\\007]+)', 'g');\r
@@ -68,6 +76,17 @@ kiwi.view.Channel = Backbone.View.extend({
     show: function () {\r
         $('#panel1 .scroller').children().css('display','none');\r
         $(this.el).css('display', 'block');\r
+        this.model.get("members").view.show();\r
+        kiwi.front.ui.setTopicText(this.model.get("topic"))\r
+    },\r
+    topic: function (topic) {\r
+        if (!topic) {\r
+            topic = this.model.get("topic");\r
+        }\r
+        this.model.addMsg(null, ' ', '=== Topic for ' + this.model.get("name") + ' is: ' + topic, 'topic');\r
+        if ($(this.el).css('display') === 'block') {\r
+            kiwi.front.ui.setTopicText(this.model.get("topic"))\r
+        }\r
     }\r
 });\r
 \r