From: Darren <darren@darrenwhitlen.com>
Date: Sun, 7 Oct 2012 15:50:20 +0000 (+0100)
Subject: model.Application refactor
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6d52d13a51619e116af1fb769cd6176632b9da4b;p=KiwiIRC.git

model.Application refactor
---

diff --git a/client_backbone/dev/model_application.js b/client_backbone/dev/model_application.js
index d0a2885..6028a4f 100755
--- a/client_backbone/dev/model_application.js
+++ b/client_backbone/dev/model_application.js
@@ -1,885 +1,891 @@
-kiwi.model.Application = Backbone.Model.extend(new (function () {
-
+kiwi.model.Application = function () {
     // Set to a reference to this object within initialize()
     var that = null;
 
     // The auto connect details entered into the server select box
     var auto_connect_details = {};
 
-    /** Instance of kiwi.model.PanelList */
-    this.panels = null;
 
-    /** kiwi.view.Application */
-    this.view = null;
+    var model = function () {
+        /** Instance of kiwi.model.PanelList */
+        this.panels = null;
 
-    /** kiwi.view.StatusMessage */
-    this.message = null;
+        /** kiwi.view.Application */
+        this.view = null;
 
-    /* Address for the kiwi server */
-    this.kiwi_server = null;
+        /** kiwi.view.StatusMessage */
+        this.message = null;
 
-    this.initialize = function () {
-        that = this;
+        /* Address for the kiwi server */
+        this.kiwi_server = null;
 
-        // Best guess at where the kiwi server is
-        this.detectKiwiServer();
-    };
+        this.initialize = function () {
+            that = this;
 
-    this.start = function () {
-        // Only debug if set in the querystring
-        if (!getQueryVariable('debug')) {
-            manageDebug(false);
-        } else {
-            //manageDebug(true);
-        }
-        
-        // Set the gateway up
-        kiwi.gateway = new kiwi.model.Gateway();
-        this.bindGatewayCommands(kiwi.gateway);
+            // Best guess at where the kiwi server is
+            this.detectKiwiServer();
+        };
 
-        this.initializeClient();
-        this.initializeGlobals();
+        this.start = function () {
+            // Only debug if set in the querystring
+            if (!getQueryVariable('debug')) {
+                manageDebug(false);
+            } else {
+                //manageDebug(true);
+            }
+            
+            // Set the gateway up
+            kiwi.gateway = new kiwi.model.Gateway();
+            this.bindGatewayCommands(kiwi.gateway);
 
-        this.view.barsHide(true);
+            this.initializeClient();
+            this.initializeGlobals();
 
-        this.panels.server.server_login.bind('server_connect', function (event) {
-            var server_login = this;
-            auto_connect_details = event;
+            this.view.barsHide(true);
 
-            server_login.networkConnecting();
-            
-            $script(that.kiwi_server + '/socket.io/socket.io.js?ts='+(new Date().getTime()), function () {
-                if (!window.io) {
-                    kiwiServerNotFound();
-                    return;
-                }
-                kiwi.gateway.set('kiwi_server', that.kiwi_server + '/kiwi');
-                kiwi.gateway.set('nick', event.nick);
+            this.panels.server.server_login.bind('server_connect', function (event) {
+                var server_login = this;
+                auto_connect_details = event;
+
+                server_login.networkConnecting();
                 
-                kiwi.gateway.connect(event.server, event.port, event.ssl, event.password, function () {});
+                $script(that.kiwi_server + '/socket.io/socket.io.js?ts='+(new Date().getTime()), function () {
+                    if (!window.io) {
+                        kiwiServerNotFound();
+                        return;
+                    }
+                    kiwi.gateway.set('kiwi_server', that.kiwi_server + '/kiwi');
+                    kiwi.gateway.set('nick', event.nick);
+                    
+                    kiwi.gateway.connect(event.server, event.port, event.ssl, event.password, function () {});
+                });
             });
-        });
-
-        // TODO: Shouldn't really be here but it's not working in the view.. :/
-        // Hack for firefox browers: Focus is not given on this event loop iteration
-        setTimeout(function(){
-            kiwi.app.panels.server.server_login.$el.find('.nick').select();
-        }, 0);
-    };
 
-
-    function kiwiServerNotFound (e) {
-        that.panels.server.server_login.showError();
-    }
+            // TODO: Shouldn't really be here but it's not working in the view.. :/
+            // Hack for firefox browers: Focus is not given on this event loop iteration
+            setTimeout(function(){
+                kiwi.app.panels.server.server_login.$el.find('.nick').select();
+            }, 0);
+        };
 
 
-    this.detectKiwiServer = function () {
-        // If running from file, default to localhost:7777 by default
-        if (window.location.protocol === 'file:') {
-            this.kiwi_server = 'http://localhost:7778';
-        } else {
-            // Assume the kiwi server is on the same server
-            this.kiwi_server = window.location.protocol + '//' + window.location.host;
+        function kiwiServerNotFound (e) {
+            that.panels.server.server_login.showError();
         }
-    };
 
 
-    this.initializeClient = function () {
-        this.view = new kiwi.view.Application({model: this, el: this.get('container')});
-        
-        /**
-         * Set the UI components up
-         */
-        this.panels = new kiwi.model.PanelList();
+        this.detectKiwiServer = function () {
+            // If running from file, default to localhost:7777 by default
+            if (window.location.protocol === 'file:') {
+                this.kiwi_server = 'http://localhost:7778';
+            } else {
+                // Assume the kiwi server is on the same server
+                this.kiwi_server = window.location.protocol + '//' + window.location.host;
+            }
+        };
 
-        this.controlbox = new kiwi.view.ControlBox({el: $('#controlbox')[0]});
-        this.bindControllboxCommands(this.controlbox);
 
-        this.topicbar = new kiwi.view.TopicBar({el: $('#topic')[0]});
+        this.initializeClient = function () {
+            this.view = new kiwi.view.Application({model: this, el: this.get('container')});
+            
+            /**
+             * Set the UI components up
+             */
+            this.panels = new kiwi.model.PanelList();
 
-        this.message = new kiwi.view.StatusMessage({el: $('#status_message')[0]});
+            this.controlbox = new kiwi.view.ControlBox({el: $('#controlbox')[0]});
+            this.bindControllboxCommands(this.controlbox);
 
-        this.resize_handle = new kiwi.view.ResizeHandler({el: $('#memberlists_resize_handle')[0]});
-        
-        this.panels.server.view.show();
+            this.topicbar = new kiwi.view.TopicBar({el: $('#topic')[0]});
 
-        // Rejigg the UI sizes
-        this.view.doLayout();
+            this.message = new kiwi.view.StatusMessage({el: $('#status_message')[0]});
 
-        this.populateDefaultServerSettings();
-    };
+            this.resize_handle = new kiwi.view.ResizeHandler({el: $('#memberlists_resize_handle')[0]});
+            
+            this.panels.server.view.show();
 
+            // Rejigg the UI sizes
+            this.view.doLayout();
 
-    this.initializeGlobals = function () {
-        kiwi.global.control = this.controlbox;
-    };
+            this.populateDefaultServerSettings();
+        };
 
 
-    this.populateDefaultServerSettings = function () {
-        var parts;
-        var defaults = {
-            nick: getQueryVariable('nick') || 'kiwi_' + Math.ceil(Math.random() * 10000).toString(),
-            server: 'irc.kiwiirc.com',
-            port: 6667,
-            ssl: false,
-            channel: window.location.hash || '#kiwiirc'
+        this.initializeGlobals = function () {
+            kiwi.global.control = this.controlbox;
         };
 
-        // Process the URL part by part, extracting as we go
-        parts = window.location.pathname.toString().split('/');
-        parts.shift();
 
-        if (parts.length > 0 && parts[0].toLowerCase() === 'client') {
+        this.populateDefaultServerSettings = function () {
+            var parts;
+            var defaults = {
+                nick: getQueryVariable('nick') || 'kiwi_' + Math.ceil(Math.random() * 10000).toString(),
+                server: 'irc.kiwiirc.com',
+                port: 6667,
+                ssl: false,
+                channel: window.location.hash || '#kiwiirc'
+            };
+
+            // Process the URL part by part, extracting as we go
+            parts = window.location.pathname.toString().split('/');
             parts.shift();
 
-            if (parts.length > 0 && parts[0]) {
-                // TODO: Extract the port from this hostname
-                defaults.server = parts[0];
+            if (parts.length > 0 && parts[0].toLowerCase() === 'client') {
                 parts.shift();
-            }
 
-            if (parts.length > 0 && parts[0]) {
-                defaults.channel = '#' + parts[0];
-                parts.shift();
+                if (parts.length > 0 && parts[0]) {
+                    // TODO: Extract the port from this hostname
+                    defaults.server = parts[0];
+                    parts.shift();
+                }
+
+                if (parts.length > 0 && parts[0]) {
+                    defaults.channel = '#' + parts[0];
+                    parts.shift();
+                }
             }
-        }
 
-        // Set any random numbers if needed
-        defaults.nick = defaults.nick.replace('?', Math.floor(Math.random() * 100000).toString());
+            // Set any random numbers if needed
+            defaults.nick = defaults.nick.replace('?', Math.floor(Math.random() * 100000).toString());
 
-        // Populate the server select box with defaults
-        this.panels.server.server_login.populateFields(defaults);
-    };
+            // Populate the server select box with defaults
+            this.panels.server.server_login.populateFields(defaults);
+        };
 
 
-    this.bindGatewayCommands = function (gw) {
-        gw.on('onmotd', function (event) {
-            that.panels.server.addMsg(kiwi.gateway.get('name'), event.msg, 'motd');
-        });
+        this.bindGatewayCommands = function (gw) {
+            gw.on('onmotd', function (event) {
+                that.panels.server.addMsg(kiwi.gateway.get('name'), event.msg, 'motd');
+            });
 
 
-        gw.on('onconnect', function (event) {
-            that.view.barsShow();
-            
-            if (auto_connect_details.channel) {
-                that.controlbox.processInput('/JOIN ' + auto_connect_details.channel);
-            }
-        });
+            gw.on('onconnect', function (event) {
+                that.view.barsShow();
+                
+                if (auto_connect_details.channel) {
+                    that.controlbox.processInput('/JOIN ' + auto_connect_details.channel);
+                }
+            });
 
 
-        (function () {
-            var gw_stat = 0;
+            (function () {
+                var gw_stat = 0;
 
-            gw.on('disconnect', function (event) {
-                var msg = 'You have been disconnected. Attempting to reconnect for you..';
-                that.message.text(msg, {timeout: 10000});
+                gw.on('disconnect', function (event) {
+                    var msg = 'You have been disconnected. Attempting to reconnect for you..';
+                    that.message.text(msg, {timeout: 10000});
 
-                // Mention the disconnection on every channel
-                $.each(kiwi.app.panels.models, function (idx, panel) {
-                    if (!panel || !panel.isChannel()) return;
-                    panel.addMsg('', msg, 'action quit');
+                    // Mention the disconnection on every channel
+                    $.each(kiwi.app.panels.models, function (idx, panel) {
+                        if (!panel || !panel.isChannel()) return;
+                        panel.addMsg('', msg, 'action quit');
+                    });
+                    kiwi.app.panels.server.addMsg('', msg, 'action quit');
+
+                    gw_stat = 1;
+                });
+                gw.on('reconnecting', function (event) {
+                    msg = 'You have been disconnected. Attempting to reconnect again in ' + (event.delay/1000) + ' seconds..';
+                    kiwi.app.panels.server.addMsg('', msg, 'action quit');
                 });
-                kiwi.app.panels.server.addMsg('', msg, 'action quit');
+                gw.on('connect', function (event) {
+                    if (gw_stat !== 1) return;
 
-                gw_stat = 1;
-            });
-            gw.on('reconnecting', function (event) {
-                msg = 'You have been disconnected. Attempting to reconnect again in ' + (event.delay/1000) + ' seconds..';
-                kiwi.app.panels.server.addMsg('', msg, 'action quit');
-            });
-            gw.on('connect', function (event) {
-                if (gw_stat !== 1) return;
+                    var msg = 'It\'s OK, you\'re connected again :)';
+                    that.message.text(msg, {timeout: 5000});
 
-                var msg = 'It\'s OK, you\'re connected again :)';
-                that.message.text(msg, {timeout: 5000});
+                    // Mention the disconnection on every channel
+                    $.each(kiwi.app.panels.models, function (idx, panel) {
+                        if (!panel || !panel.isChannel()) return;
+                        panel.addMsg('', msg, 'action join');
+                    });
+                    kiwi.app.panels.server.addMsg('', msg, 'action join');
 
-                // Mention the disconnection on every channel
-                $.each(kiwi.app.panels.models, function (idx, panel) {
-                    if (!panel || !panel.isChannel()) return;
-                    panel.addMsg('', msg, 'action join');
+                    gw_stat = 0;
                 });
-                kiwi.app.panels.server.addMsg('', msg, 'action join');
-
-                gw_stat = 0;
-            });
-        })();
+            })();
 
 
-        gw.on('onjoin', function (event) {
-            var c, members, user;
-            c = that.panels.getByName(event.channel);
-            if (!c) {
-                c = new kiwi.model.Channel({name: event.channel});
-                that.panels.add(c);
-            }
+            gw.on('onjoin', function (event) {
+                var c, members, user;
+                c = that.panels.getByName(event.channel);
+                if (!c) {
+                    c = new kiwi.model.Channel({name: event.channel});
+                    that.panels.add(c);
+                }
 
-            members = c.get('members');
-            if (!members) return;
+                members = c.get('members');
+                if (!members) return;
 
-            user = new kiwi.model.Member({nick: event.nick, ident: event.ident, hostname: event.hostname});
-            members.add(user);
-            // TODO: highlight the new channel in some way
-        });
+                user = new kiwi.model.Member({nick: event.nick, ident: event.ident, hostname: event.hostname});
+                members.add(user);
+                // TODO: highlight the new channel in some way
+            });
 
 
-        gw.on('onpart', function (event) {
-            var channel, members, user,
-                part_options = {};
+            gw.on('onpart', function (event) {
+                var channel, members, user,
+                    part_options = {};
 
-            part_options.type = 'part';
-            part_options.message = event.message || '';
+                part_options.type = 'part';
+                part_options.message = event.message || '';
 
-            channel = that.panels.getByName(event.channel);
-            if (!channel) return;
+                channel = that.panels.getByName(event.channel);
+                if (!channel) return;
 
-            // If this is us, close the panel
-            if (event.nick === kiwi.gateway.get('nick')) {
-                channel.close();
-                return;
-            }
+                // If this is us, close the panel
+                if (event.nick === kiwi.gateway.get('nick')) {
+                    channel.close();
+                    return;
+                }
 
-            members = channel.get('members');
-            if (!members) return;
+                members = channel.get('members');
+                if (!members) return;
 
-            user = members.getByNick(event.nick);
-            if (!user) return;
+                user = members.getByNick(event.nick);
+                if (!user) return;
 
-            members.remove(user, part_options);
-        });
+                members.remove(user, part_options);
+            });
 
 
-        gw.on('onquit', function (event) {
-            var member, members,
-                quit_options = {};
+            gw.on('onquit', function (event) {
+                var member, members,
+                    quit_options = {};
 
-            quit_options.type = 'quit';
-            quit_options.message = event.message || '';
+                quit_options.type = 'quit';
+                quit_options.message = event.message || '';
 
-            $.each(that.panels.models, function (index, panel) {
-                if (!panel.isChannel()) return;
+                $.each(that.panels.models, function (index, panel) {
+                    if (!panel.isChannel()) return;
 
-                member = panel.get('members').getByNick(event.nick);
-                if (member) {
-                    panel.get('members').remove(member, quit_options);
-                }
+                    member = panel.get('members').getByNick(event.nick);
+                    if (member) {
+                        panel.get('members').remove(member, quit_options);
+                    }
+                });
             });
-        });
 
 
-        gw.on('onkick', function (event) {
-            var channel, members, user,
-                part_options = {};
+            gw.on('onkick', function (event) {
+                var channel, members, user,
+                    part_options = {};
 
-            part_options.type = 'kick';
-            part_options.by = event.nick;
-            part_options.message = event.message || '';
+                part_options.type = 'kick';
+                part_options.by = event.nick;
+                part_options.message = event.message || '';
 
-            channel = that.panels.getByName(event.channel);
-            if (!channel) return;
+                channel = that.panels.getByName(event.channel);
+                if (!channel) return;
 
-            members = channel.get('members');
-            if (!members) return;
+                members = channel.get('members');
+                if (!members) return;
 
-            user = members.getByNick(event.kicked);
-            if (!user) return;
+                user = members.getByNick(event.kicked);
+                if (!user) return;
 
-            members.remove(user, part_options);
+                members.remove(user, part_options);
 
-            if (event.kicked === kiwi.gateway.get('nick')) {
-                members.reset([]);
-            }
-            
-        });
+                if (event.kicked === kiwi.gateway.get('nick')) {
+                    members.reset([]);
+                }
+                
+            });
 
 
-        gw.on('onmsg', function (event) {
-            var panel,
-                is_pm = (event.channel == kiwi.gateway.get('nick'));
+            gw.on('onmsg', function (event) {
+                var panel,
+                    is_pm = (event.channel == kiwi.gateway.get('nick'));
 
-            if (is_pm) {
-                // If a panel isn't found for this PM, create one
-                panel = that.panels.getByName(event.nick);
-                if (!panel) {
-                    panel = new kiwi.model.Channel({name: event.nick});
-                    that.panels.add(panel);
-                }
+                if (is_pm) {
+                    // If a panel isn't found for this PM, create one
+                    panel = that.panels.getByName(event.nick);
+                    if (!panel) {
+                        panel = new kiwi.model.Channel({name: event.nick});
+                        that.panels.add(panel);
+                    }
 
-            } else {
-                // If a panel isn't found for this channel, reroute to the
-                // server panel
-                panel = that.panels.getByName(event.channel);
-                if (!panel) {
-                    panel = that.panels.server;
+                } else {
+                    // If a panel isn't found for this channel, reroute to the
+                    // server panel
+                    panel = that.panels.getByName(event.channel);
+                    if (!panel) {
+                        panel = that.panels.server;
+                    }
                 }
-            }
-            
-            panel.addMsg(event.nick, event.msg);
-        });
+                
+                panel.addMsg(event.nick, event.msg);
+            });
 
 
-        gw.on('onnotice', function (event) {
-            var panel;
+            gw.on('onnotice', function (event) {
+                var panel;
 
-            // Find a panel for the destination(channel) or who its from
-            panel = that.panels.getByName(event.target) || that.panels.getByName(event.nick);
-            if (!panel) {
-                panel = that.panels.server;
-            }
+                // Find a panel for the destination(channel) or who its from
+                panel = that.panels.getByName(event.target) || that.panels.getByName(event.nick);
+                if (!panel) {
+                    panel = that.panels.server;
+                }
 
-            panel.addMsg('[' + (event.nick||'') + ']', event.msg);
-        });
+                panel.addMsg('[' + (event.nick||'') + ']', event.msg);
+            });
 
 
-        gw.on('onaction', function (event) {
-            var panel,
-                is_pm = (event.channel == kiwi.gateway.get('nick'));
+            gw.on('onaction', function (event) {
+                var panel,
+                    is_pm = (event.channel == kiwi.gateway.get('nick'));
 
-            if (is_pm) {
-                // If a panel isn't found for this PM, create one
-                panel = that.panels.getByName(event.nick);
-                if (!panel) {
-                    panel = new kiwi.model.Channel({name: event.nick});
-                    that.panels.add(panel);
-                }
+                if (is_pm) {
+                    // If a panel isn't found for this PM, create one
+                    panel = that.panels.getByName(event.nick);
+                    if (!panel) {
+                        panel = new kiwi.model.Channel({name: event.nick});
+                        that.panels.add(panel);
+                    }
 
-            } else {
-                // If a panel isn't found for this channel, reroute to the
-                // server panel
-                panel = that.panels.getByName(event.channel);
-                if (!panel) {
-                    panel = that.panels.server;
+                } else {
+                    // If a panel isn't found for this channel, reroute to the
+                    // server panel
+                    panel = that.panels.getByName(event.channel);
+                    if (!panel) {
+                        panel = that.panels.server;
+                    }
                 }
-            }
 
-            panel.addMsg('', '* ' + event.nick + ' ' + event.msg, 'action');
-        });
+                panel.addMsg('', '* ' + event.nick + ' ' + event.msg, 'action');
+            });
 
 
-        gw.on('ontopic', function (event) {
-            var c;
-            c = that.panels.getByName(event.channel);
-            if (!c) return;
+            gw.on('ontopic', function (event) {
+                var c;
+                c = that.panels.getByName(event.channel);
+                if (!c) return;
 
-            // Set the channels topic
-            c.set('topic', event.topic);
+                // Set the channels topic
+                c.set('topic', event.topic);
 
-            // If this is the active channel, update the topic bar too
-            if (c.get('name') === kiwi.app.panels.active.get('name')) {
-                that.topicbar.setCurrentTopic(event.topic);
-            }
-        });
+                // If this is the active channel, update the topic bar too
+                if (c.get('name') === kiwi.app.panels.active.get('name')) {
+                    that.topicbar.setCurrentTopic(event.topic);
+                }
+            });
 
 
-        gw.on('ontopicsetby', function (event) {
-            var c, when;
-            c = that.panels.getByName(event.channel);
-            if (!c) return;
+            gw.on('ontopicsetby', function (event) {
+                var c, when;
+                c = that.panels.getByName(event.channel);
+                if (!c) return;
 
-            when = formatDate(new Date(event.when * 1000));
-            c.addMsg('', 'Topic set by ' + event.nick + ' at ' + when, 'topic');
-        });
+                when = formatDate(new Date(event.when * 1000));
+                c.addMsg('', 'Topic set by ' + event.nick + ' at ' + when, 'topic');
+            });
 
 
-        gw.on('onuserlist', function (event) {
-            var channel;
-            channel = that.panels.getByName(event.channel);
+            gw.on('onuserlist', function (event) {
+                var channel;
+                channel = that.panels.getByName(event.channel);
 
-            // If we didn't find a channel for this, may aswell leave
-            if (!channel) return;
+                // If we didn't find a channel for this, may aswell leave
+                if (!channel) return;
 
-            channel.temp_userlist = channel.temp_userlist || [];
-            _.each(event.users, function (item) {
-                var user = new kiwi.model.Member({nick: item.nick, modes: item.modes});
-                channel.temp_userlist.push(user);
+                channel.temp_userlist = channel.temp_userlist || [];
+                _.each(event.users, function (item) {
+                    var user = new kiwi.model.Member({nick: item.nick, modes: item.modes});
+                    channel.temp_userlist.push(user);
+                });
             });
-        });
 
 
-        gw.on('onuserlist_end', function (event) {
-            var channel;
-            channel = that.panels.getByName(event.channel);
+            gw.on('onuserlist_end', function (event) {
+                var channel;
+                channel = that.panels.getByName(event.channel);
 
-            // If we didn't find a channel for this, may aswell leave
-            if (!channel) return;
+                // If we didn't find a channel for this, may aswell leave
+                if (!channel) return;
 
-            // Update the members list with the new list
-            channel.get('members').reset(channel.temp_userlist || []);
+                // Update the members list with the new list
+                channel.get('members').reset(channel.temp_userlist || []);
 
-            // Clear the temporary userlist
-            delete channel.temp_userlist;
-        });
+                // Clear the temporary userlist
+                delete channel.temp_userlist;
+            });
 
 
-        gw.on('onmode', function (event) {
-            var channel, i, prefixes, members, member, find_prefix;
-            
-            // Build a nicely formatted string to be displayed to a regular human
-            function friendlyModeString (event_modes, alt_target) {
-                var modes = {}, return_string;
-
-                // If no default given, use the main event info
-                if (!event_modes) {
-                    event_modes = event.modes;
-                    alt_target = event.target;
-                }
+            gw.on('onmode', function (event) {
+                var channel, i, prefixes, members, member, find_prefix;
+                
+                // Build a nicely formatted string to be displayed to a regular human
+                function friendlyModeString (event_modes, alt_target) {
+                    var modes = {}, return_string;
+
+                    // If no default given, use the main event info
+                    if (!event_modes) {
+                        event_modes = event.modes;
+                        alt_target = event.target;
+                    }
 
-                // Reformat the mode object to make it easier to work with
-                _.each(event_modes, function (mode){
-                    var param = mode.param || alt_target || '';
+                    // Reformat the mode object to make it easier to work with
+                    _.each(event_modes, function (mode){
+                        var param = mode.param || alt_target || '';
 
-                    // Make sure we have some modes for this param
-                    if (!modes[param]) {
-                        modes[param] = {'+':'', '-':''};
-                    }
+                        // Make sure we have some modes for this param
+                        if (!modes[param]) {
+                            modes[param] = {'+':'', '-':''};
+                        }
 
-                    modes[param][mode.mode[0]] += mode.mode.substr(1);
-                });
+                        modes[param][mode.mode[0]] += mode.mode.substr(1);
+                    });
 
-                // Put the string together from each mode
-                return_string = [];
-                _.each(modes, function (modeset, param) {
-                    var str = '';
-                    if (modeset['+']) str += '+' + modeset['+'];
-                    if (modeset['-']) str += '-' + modeset['-'];
-                    return_string.push(str + ' ' + param);
-                });
-                return_string = return_string.join(', ');
+                    // Put the string together from each mode
+                    return_string = [];
+                    _.each(modes, function (modeset, param) {
+                        var str = '';
+                        if (modeset['+']) str += '+' + modeset['+'];
+                        if (modeset['-']) str += '-' + modeset['-'];
+                        return_string.push(str + ' ' + param);
+                    });
+                    return_string = return_string.join(', ');
 
-                return return_string;
-            }
+                    return return_string;
+                }
 
 
-            channel = that.panels.getByName(event.target);
-            if (channel) {
-                prefixes = kiwi.gateway.get('user_prefixes');
-                find_prefix = function (p) {
-                    return event.modes[i].mode[1] === p.mode;
-                };
-                for (i = 0; i < event.modes.length; i++) {
-                    if (_.any(prefixes, find_prefix)) {
-                        if (!members) {
-                            members = channel.get('members');
-                        }
-                        member = members.getByNick(event.modes[i].param);
-                        if (!member) {
-                            console.log('MODE command recieved for unknown member %s on channel %s', event.modes[i].param, event.target);
-                            return;
-                        } else {
-                            if (event.modes[i].mode[0] === '+') {
-                                member.addMode(event.modes[i].mode[1]);
-                            } else if (event.modes[i].mode[0] === '-') {
-                                member.removeMode(event.modes[i].mode[1]);
+                channel = that.panels.getByName(event.target);
+                if (channel) {
+                    prefixes = kiwi.gateway.get('user_prefixes');
+                    find_prefix = function (p) {
+                        return event.modes[i].mode[1] === p.mode;
+                    };
+                    for (i = 0; i < event.modes.length; i++) {
+                        if (_.any(prefixes, find_prefix)) {
+                            if (!members) {
+                                members = channel.get('members');
                             }
-                            members.sort();
-                            //channel.addMsg('', '=== ' + event.nick + ' set mode ' + event.modes[i].mode + ' ' + event.modes[i].param, 'action mode');
+                            member = members.getByNick(event.modes[i].param);
+                            if (!member) {
+                                console.log('MODE command recieved for unknown member %s on channel %s', event.modes[i].param, event.target);
+                                return;
+                            } else {
+                                if (event.modes[i].mode[0] === '+') {
+                                    member.addMode(event.modes[i].mode[1]);
+                                } else if (event.modes[i].mode[0] === '-') {
+                                    member.removeMode(event.modes[i].mode[1]);
+                                }
+                                members.sort();
+                                //channel.addMsg('', '=== ' + event.nick + ' set mode ' + event.modes[i].mode + ' ' + event.modes[i].param, 'action mode');
+                            }
+                        } else {
+                            // Channel mode being set
+                            // TODO: Store this somewhere?
+                            //channel.addMsg('', 'CHANNEL === ' + event.nick + ' set mode ' + event.modes[i].mode + ' on ' + event.target, 'action mode');
                         }
-                    } else {
-                        // Channel mode being set
-                        // TODO: Store this somewhere?
-                        //channel.addMsg('', 'CHANNEL === ' + event.nick + ' set mode ' + event.modes[i].mode + ' on ' + event.target, 'action mode');
                     }
-                }
 
-                channel.addMsg('', '=== ' + event.nick + ' sets mode ' + friendlyModeString(), 'action mode');
-            } else {
-                // This is probably a mode being set on us.
-                if (event.target.toLowerCase() === kiwi.gateway.get("nick").toLowerCase()) {
-                    that.panels.server.addMsg('', '=== ' + event.nick + ' set mode ' + friendlyModeString(), 'action mode');
+                    channel.addMsg('', '=== ' + event.nick + ' sets mode ' + friendlyModeString(), 'action mode');
                 } else {
-                   console.log('MODE command recieved for unknown target %s: ', event.target, event);
+                    // This is probably a mode being set on us.
+                    if (event.target.toLowerCase() === kiwi.gateway.get("nick").toLowerCase()) {
+                        that.panels.server.addMsg('', '=== ' + event.nick + ' set mode ' + friendlyModeString(), 'action mode');
+                    } else {
+                       console.log('MODE command recieved for unknown target %s: ', event.target, event);
+                    }
                 }
-            }
-        });
+            });
 
 
-        gw.on('onnick', function (event) {
-            var member;
+            gw.on('onnick', function (event) {
+                var member;
 
-            $.each(that.panels.models, function (index, panel) {
-                if (!panel.isChannel()) return;
+                $.each(that.panels.models, function (index, panel) {
+                    if (!panel.isChannel()) return;
 
-                member = panel.get('members').getByNick(event.nick);
-                if (member) {
-                    member.set('nick', event.newnick);
-                    panel.addMsg('', '== ' + event.nick + ' is now known as ' + event.newnick, 'action nick');
-                }
+                    member = panel.get('members').getByNick(event.nick);
+                    if (member) {
+                        member.set('nick', event.newnick);
+                        panel.addMsg('', '== ' + event.nick + ' is now known as ' + event.newnick, 'action nick');
+                    }
+                });
             });
-        });
-
 
-        gw.on('onwhois', function (event) {
-            /*globals secondsToTime */
-            var logon_date, idle_time = '', panel;
 
-            if (event.end) {
-                return;
-            }
+            gw.on('onwhois', function (event) {
+                /*globals secondsToTime */
+                var logon_date, idle_time = '', panel;
 
-            if (typeof event.idle !== 'undefined') {
-                idle_time = secondsToTime(parseInt(event.idle, 10));
-                idle_time = idle_time.h.toString().lpad(2, "0") + ':' + idle_time.m.toString().lpad(2, "0") + ':' + idle_time.s.toString().lpad(2, "0");
-            }
+                if (event.end) {
+                    return;
+                }
 
-            panel = kiwi.app.panels.active;
-            if (event.ident) {
-                panel.addMsg(event.nick, 'is ' + event.nick + '!' + event.ident + '@' + event.host + ' * ' + event.msg, 'whois');
-            } else if (event.chans) {
-                panel.addMsg(event.nick, 'on ' + event.chans, 'whois');
-            } else if (event.server) {
-                panel.addMsg(event.nick, 'using ' + event.server, 'whois');
-            } else if (event.msg) {
-                panel.addMsg(event.nick, event.msg, 'whois');
-            } else if (event.logon) {
-                logon_date = new Date();
-                logon_date.setTime(event.logon * 1000);
-                logon_date = formatDate(logon_date);
-
-                panel.addMsg(event.nick, 'idle for ' + idle_time + ', signed on ' + logon_date, 'whois');
-            } else {
-                panel.addMsg(event.nick, 'idle for ' + idle_time, 'whois');
-            }
-        });
+                if (typeof event.idle !== 'undefined') {
+                    idle_time = secondsToTime(parseInt(event.idle, 10));
+                    idle_time = idle_time.h.toString().lpad(2, "0") + ':' + idle_time.m.toString().lpad(2, "0") + ':' + idle_time.s.toString().lpad(2, "0");
+                }
 
+                panel = kiwi.app.panels.active;
+                if (event.ident) {
+                    panel.addMsg(event.nick, 'is ' + event.nick + '!' + event.ident + '@' + event.host + ' * ' + event.msg, 'whois');
+                } else if (event.chans) {
+                    panel.addMsg(event.nick, 'on ' + event.chans, 'whois');
+                } else if (event.server) {
+                    panel.addMsg(event.nick, 'using ' + event.server, 'whois');
+                } else if (event.msg) {
+                    panel.addMsg(event.nick, event.msg, 'whois');
+                } else if (event.logon) {
+                    logon_date = new Date();
+                    logon_date.setTime(event.logon * 1000);
+                    logon_date = formatDate(logon_date);
+
+                    panel.addMsg(event.nick, 'idle for ' + idle_time + ', signed on ' + logon_date, 'whois');
+                } else {
+                    panel.addMsg(event.nick, 'idle for ' + idle_time, 'whois');
+                }
+            });
 
-        gw.on('onlist_start', function (data) {
-            if (kiwi.app.channel_list) {
-                kiwi.app.channel_list.close();
-                delete kiwi.app.channel_list;
-            }
 
-            var panel = new kiwi.model.Applet(),
-                applet = new kiwi.applets.Chanlist();
+            gw.on('onlist_start', function (data) {
+                if (kiwi.app.channel_list) {
+                    kiwi.app.channel_list.close();
+                    delete kiwi.app.channel_list;
+                }
 
-            panel.load(applet);
-            
-            kiwi.app.panels.add(panel);
-            panel.view.show();
-            
-            kiwi.app.channel_list = applet;
-        });
+                var panel = new kiwi.model.Applet(),
+                    applet = new kiwi.applets.Chanlist();
 
+                panel.load(applet);
+                
+                kiwi.app.panels.add(panel);
+                panel.view.show();
+                
+                kiwi.app.channel_list = applet;
+            });
 
-        gw.on('onlist_channel', function (data) {
-            // TODO: Put this listener within the applet itself
-            kiwi.app.channel_list.addChannel(data.chans);
-        });
 
+            gw.on('onlist_channel', function (data) {
+                // TODO: Put this listener within the applet itself
+                kiwi.app.channel_list.addChannel(data.chans);
+            });
 
-        gw.on('onlist_end', function (data) {
-            // TODO: Put this listener within the applet itself
-            delete kiwi.app.channel_list;
-        });
 
+            gw.on('onlist_end', function (data) {
+                // TODO: Put this listener within the applet itself
+                delete kiwi.app.channel_list;
+            });
 
-        gw.on('onirc_error', function (data) {
-            var panel, tmp;
 
-            if (data.channel !== undefined && !(panel = kiwi.app.panels.getByName(data.channel))) {
-                panel = kiwi.app.panels.server;
-            }
+            gw.on('onirc_error', function (data) {
+                var panel, tmp;
 
-            switch (data.error) {
-            case 'banned_from_channel':
-                panel.addMsg(' ', '=== You are banned from ' + data.channel + '. ' + data.reason, 'status');
-                kiwi.app.message.text('You are banned from ' + data.channel + '. ' + data.reason);
-                break;
-            case 'bad_channel_key':
-                panel.addMsg(' ', '=== Bad channel key for ' + data.channel, 'status');
-                kiwi.app.message.text('Bad channel key or password for ' + data.channel);
-                break;
-            case 'invite_only_channel':
-                panel.addMsg(' ', '=== ' + data.channel + ' is invite only.', 'status');
-                kiwi.app.message.text(data.channel + ' is invite only');
-                break;
-            case 'channel_is_full':
-                panel.addMsg(' ', '=== ' + data.channel + ' is full.', 'status');
-                kiwi.app.message.text(data.channel + ' is full');
-                break;
-            case 'chanop_privs_needed':
-                panel.addMsg(' ', '=== ' + data.reason, 'status');
-                kiwi.app.message.text(data.reason + ' (' + data.channel + ')');
-                break;
-            case 'no_such_nick':
-                tmp = kiwi.app.panels.getByName(data.nick);
-                if (tmp) {
-                    tmp.addMsg(' ', '=== ' + data.nick + ': ' + data.reason, 'status');
-                } else {
-                    kiwi.app.panels.server.addMsg(' ', '=== ' + data.nick + ': ' + data.reason, 'status');
-                }
-                break;
-            case 'nickname_in_use':
-                kiwi.app.panels.server.addMsg(' ', '=== The nickname ' + data.nick + ' is already in use. Please select a new nickname', 'status');
-                if (kiwi.app.panels.server !== kiwi.app.panels.active) {
-                    kiwi.app.message.text('The nickname "' + data.nick + '" is already in use. Please select a new nickname');
+                if (data.channel !== undefined && !(panel = kiwi.app.panels.getByName(data.channel))) {
+                    panel = kiwi.app.panels.server;
                 }
 
-                // Only show the nickchange component if the controlbox is open
-                if (that.controlbox.$el.css('display') !== 'none') {
-                    (new kiwi.view.NickChangeBox()).render();
+                switch (data.error) {
+                case 'banned_from_channel':
+                    panel.addMsg(' ', '=== You are banned from ' + data.channel + '. ' + data.reason, 'status');
+                    kiwi.app.message.text('You are banned from ' + data.channel + '. ' + data.reason);
+                    break;
+                case 'bad_channel_key':
+                    panel.addMsg(' ', '=== Bad channel key for ' + data.channel, 'status');
+                    kiwi.app.message.text('Bad channel key or password for ' + data.channel);
+                    break;
+                case 'invite_only_channel':
+                    panel.addMsg(' ', '=== ' + data.channel + ' is invite only.', 'status');
+                    kiwi.app.message.text(data.channel + ' is invite only');
+                    break;
+                case 'channel_is_full':
+                    panel.addMsg(' ', '=== ' + data.channel + ' is full.', 'status');
+                    kiwi.app.message.text(data.channel + ' is full');
+                    break;
+                case 'chanop_privs_needed':
+                    panel.addMsg(' ', '=== ' + data.reason, 'status');
+                    kiwi.app.message.text(data.reason + ' (' + data.channel + ')');
+                    break;
+                case 'no_such_nick':
+                    tmp = kiwi.app.panels.getByName(data.nick);
+                    if (tmp) {
+                        tmp.addMsg(' ', '=== ' + data.nick + ': ' + data.reason, 'status');
+                    } else {
+                        kiwi.app.panels.server.addMsg(' ', '=== ' + data.nick + ': ' + data.reason, 'status');
+                    }
+                    break;
+                case 'nickname_in_use':
+                    kiwi.app.panels.server.addMsg(' ', '=== The nickname ' + data.nick + ' is already in use. Please select a new nickname', 'status');
+                    if (kiwi.app.panels.server !== kiwi.app.panels.active) {
+                        kiwi.app.message.text('The nickname "' + data.nick + '" is already in use. Please select a new nickname');
+                    }
+
+                    // Only show the nickchange component if the controlbox is open
+                    if (that.controlbox.$el.css('display') !== 'none') {
+                        (new kiwi.view.NickChangeBox()).render();
+                    }
+
+                    break;
+                default:
+                    // We don't know what data contains, so don't do anything with it.
+                    //kiwi.front.tabviews.server.addMsg(null, ' ', '=== ' + data, 'status');
                 }
+            });
+        };
 
-                break;
-            default:
-                // We don't know what data contains, so don't do anything with it.
-                //kiwi.front.tabviews.server.addMsg(null, ' ', '=== ' + data, 'status');
-            }
-        });
-    };
 
 
+        /**
+         * Bind to certain commands that may be typed into the control box
+         */
+        this.bindControllboxCommands = function (controlbox) {
+            // Default aliases
+            $.extend(controlbox.preprocessor.aliases, {
+                '/p': '/part $1+',
+                '/me': '/action $1+',
+                '/j': '/join $1+',
+                '/q': '/query $1+',
+                '/k': '/kick $1+'
+            });
 
-    /**
-     * Bind to certain commands that may be typed into the control box
-     */
-    this.bindControllboxCommands = function (controlbox) {
-        // Default aliases
-        $.extend(controlbox.preprocessor.aliases, {
-            '/p': '/part $1+',
-            '/me': '/action $1+',
-            '/j': '/join $1+',
-            '/q': '/query $1+',
-            '/k': '/kick $1+'
-        });
+            controlbox.on('unknown_command', unknownCommand);
 
-        controlbox.on('unknown_command', unknownCommand);
+            controlbox.on('command', allCommands);
+            controlbox.on('command_msg', msgCommand);
 
-        controlbox.on('command', allCommands);
-        controlbox.on('command_msg', msgCommand);
+            controlbox.on('command_action', actionCommand);
 
-        controlbox.on('command_action', actionCommand);
+            controlbox.on('command_join', joinCommand);
 
-        controlbox.on('command_join', joinCommand);
+            controlbox.on('command_part', partCommand);
 
-        controlbox.on('command_part', partCommand);
+            controlbox.on('command_nick', function (ev) {
+                kiwi.gateway.changeNick(ev.params[0]);
+            });
 
-        controlbox.on('command_nick', function (ev) {
-            kiwi.gateway.changeNick(ev.params[0]);
-        });
+            controlbox.on('command_query', queryCommand);
 
-        controlbox.on('command_query', queryCommand);
+            controlbox.on('command_topic', topicCommand);
 
-        controlbox.on('command_topic', topicCommand);
+            controlbox.on('command_notice', noticeCommand);
 
-        controlbox.on('command_notice', noticeCommand);
+            controlbox.on('command_quote', quoteCommand);
 
-        controlbox.on('command_quote', quoteCommand);
+            controlbox.on('command_kick', kickCommand);
 
-        controlbox.on('command_kick', kickCommand);
 
+            controlbox.on('command_css', function (ev) {
+                var queryString = '?reload=' + new Date().getTime();
+                $('link[rel="stylesheet"]').each(function () {
+                    this.href = this.href.replace(/\?.*|$/, queryString);
+                });
+            });
 
-        controlbox.on('command_css', function (ev) {
-            var queryString = '?reload=' + new Date().getTime();
-            $('link[rel="stylesheet"]').each(function () {
-                this.href = this.href.replace(/\?.*|$/, queryString);
+            controlbox.on('command_js', function (ev) {
+                if (!ev.params[0]) return;
+                $script(ev.params[0] + '?' + (new Date().getTime()));
             });
-        });
 
-        controlbox.on('command_js', function (ev) {
-            if (!ev.params[0]) return;
-            $script(ev.params[0] + '?' + (new Date().getTime()));
-        });
+            controlbox.on('command_alias', function (ev) {
+                var name, rule;
 
-        controlbox.on('command_alias', function (ev) {
-            var name, rule;
+                // No parameters passed so list them
+                if (!ev.params[1]) {
+                    $.each(controlbox.preprocessor.aliases, function (name, rule) {
+                        kiwi.app.panels.server.addMsg(' ', name + '   =>   ' + rule);
+                    });
+                    return;
+                }
 
-            // No parameters passed so list them
-            if (!ev.params[1]) {
-                $.each(controlbox.preprocessor.aliases, function (name, rule) {
-                    kiwi.app.panels.server.addMsg(' ', name + '   =>   ' + rule);
-                });
-                return;
-            }
+                // Deleting an alias?
+                if (ev.params[0] === 'del' || ev.params[0] === 'delete') {
+                    name = ev.params[1];
+                    if (name[0] !== '/') name = '/' + name;
+                    delete controlbox.preprocessor.aliases[name];
+                    return;
+                }
 
-            // Deleting an alias?
-            if (ev.params[0] === 'del' || ev.params[0] === 'delete') {
-                name = ev.params[1];
-                if (name[0] !== '/') name = '/' + name;
-                delete controlbox.preprocessor.aliases[name];
-                return;
-            }
+                // Add the alias
+                name = ev.params[0];
+                ev.params.shift();
+                rule = ev.params.join(' ');
 
-            // Add the alias
-            name = ev.params[0];
-            ev.params.shift();
-            rule = ev.params.join(' ');
+                // Make sure the name starts with a slash
+                if (name[0] !== '/') name = '/' + name;
 
-            // Make sure the name starts with a slash
-            if (name[0] !== '/') name = '/' + name;
+                // Now actually add the alias
+                controlbox.preprocessor.aliases[name] = rule;
+            });
 
-            // Now actually add the alias
-            controlbox.preprocessor.aliases[name] = rule;
-        });
+            controlbox.on('command_applet', appletCommand);
+            controlbox.on('command_settings', settingsCommand);
+        };
 
-        controlbox.on('command_applet', appletCommand);
-        controlbox.on('command_settings', settingsCommand);
-    };
+        // A fallback action. Send a raw command to the server
+        function unknownCommand (ev) {
+            var raw_cmd = ev.command + ' ' + ev.params.join(' ');
+            console.log('RAW: ' + raw_cmd);
+            kiwi.gateway.raw(raw_cmd);
+        }
 
-    // A fallback action. Send a raw command to the server
-    function unknownCommand (ev) {
-        var raw_cmd = ev.command + ' ' + ev.params.join(' ');
-        console.log('RAW: ' + raw_cmd);
-        kiwi.gateway.raw(raw_cmd);
-    }
+        function allCommands (ev) {}
 
-    function allCommands (ev) {}
+        function joinCommand (ev) {
+            var channel, channel_names;
 
-    function joinCommand (ev) {
-        var channel, channel_names;
+            channel_names = ev.params.join(' ').split(',');
 
-        channel_names = ev.params.join(' ').split(',');
+            $.each(channel_names, function (index, channel_name) {
+                // Trim any whitespace off the name
+                channel_name = channel_name.trim();
 
-        $.each(channel_names, function (index, channel_name) {
-            // Trim any whitespace off the name
-            channel_name = channel_name.trim();
+                // Check if we have the panel already. If not, create it
+                channel = that.panels.getByName(channel_name);
+                if (!channel) {
+                    channel = new kiwi.model.Channel({name: channel_name});
+                    kiwi.app.panels.add(channel);
+                }
 
-            // Check if we have the panel already. If not, create it
-            channel = that.panels.getByName(channel_name);
-            if (!channel) {
-                channel = new kiwi.model.Channel({name: channel_name});
-                kiwi.app.panels.add(channel);
-            }
+                kiwi.gateway.join(channel_name);
+            });
 
-            kiwi.gateway.join(channel_name);
-        });
+            if (channel) channel.view.show();
+            
+        }
 
-        if (channel) channel.view.show();
-        
-    }
+        function queryCommand (ev) {
+            var destination, panel;
 
-    function queryCommand (ev) {
-        var destination, panel;
+            destination = ev.params[0];
 
-        destination = ev.params[0];
+            // Check if we have the panel already. If not, create it
+            panel = that.panels.getByName(destination);
+            if (!panel) {
+                panel = new kiwi.model.Channel({name: destination});
+                kiwi.app.panels.add(panel);
+            }
 
-        // Check if we have the panel already. If not, create it
-        panel = that.panels.getByName(destination);
-        if (!panel) {
-            panel = new kiwi.model.Channel({name: destination});
-            kiwi.app.panels.add(panel);
+            if (panel) panel.view.show();
+            
         }
 
-        if (panel) panel.view.show();
-        
-    }
+        function msgCommand (ev) {
+            var destination = ev.params[0],
+                panel = that.panels.getByName(destination) || that.panels.server;
 
-    function msgCommand (ev) {
-        var destination = ev.params[0],
-            panel = that.panels.getByName(destination) || that.panels.server;
+            ev.params.shift();
 
-        ev.params.shift();
+            panel.addMsg(kiwi.gateway.get('nick'), ev.params.join(' '));
+            kiwi.gateway.privmsg(destination, ev.params.join(' '));
+        }
 
-        panel.addMsg(kiwi.gateway.get('nick'), ev.params.join(' '));
-        kiwi.gateway.privmsg(destination, ev.params.join(' '));
-    }
+        function actionCommand (ev) {
+            if (kiwi.app.panels.active === kiwi.app.panels.server) {
+                return;
+            }
 
-    function actionCommand (ev) {
-        if (kiwi.app.panels.active === kiwi.app.panels.server) {
-            return;
+            var panel = kiwi.app.panels.active;
+            panel.addMsg('', '* ' + kiwi.gateway.get('nick') + ' ' + ev.params.join(' '), 'action');
+            kiwi.gateway.action(panel.get('name'), ev.params.join(' '));
         }
 
-        var panel = kiwi.app.panels.active;
-        panel.addMsg('', '* ' + kiwi.gateway.get('nick') + ' ' + ev.params.join(' '), 'action');
-        kiwi.gateway.action(panel.get('name'), ev.params.join(' '));
-    }
-
-    function partCommand (ev) {
-        if (ev.params.length === 0) {
-            kiwi.gateway.part(kiwi.app.panels.active.get('name'));
-        } else {
-            _.each(ev.params, function (channel) {
-                kiwi.gateway.part(channel);
-            });
+        function partCommand (ev) {
+            if (ev.params.length === 0) {
+                kiwi.gateway.part(kiwi.app.panels.active.get('name'));
+            } else {
+                _.each(ev.params, function (channel) {
+                    kiwi.gateway.part(channel);
+                });
+            }
+            // TODO: More responsive = close tab now, more accurate = leave until part event
+            //kiwi.app.panels.remove(kiwi.app.panels.active);
         }
-        // TODO: More responsive = close tab now, more accurate = leave until part event
-        //kiwi.app.panels.remove(kiwi.app.panels.active);
-    }
 
-    function topicCommand (ev) {
-        var channel_name;
+        function topicCommand (ev) {
+            var channel_name;
 
-        if (ev.params.length === 0) return;
+            if (ev.params.length === 0) return;
 
-        if (that.isChannelName(ev.params[0])) {
-            channel_name = ev.params[0];
-            ev.params.shift();
-        } else {
-            channel_name = kiwi.app.panels.active.get('name');
-        }
+            if (that.isChannelName(ev.params[0])) {
+                channel_name = ev.params[0];
+                ev.params.shift();
+            } else {
+                channel_name = kiwi.app.panels.active.get('name');
+            }
 
-        kiwi.gateway.topic(channel_name, ev.params.join(' '));
-    }
+            kiwi.gateway.topic(channel_name, ev.params.join(' '));
+        }
 
-    function noticeCommand (ev) {
-        var destination;
+        function noticeCommand (ev) {
+            var destination;
 
-        // Make sure we have a destination and some sort of message
-        if (ev.params.length <= 1) return;
+            // Make sure we have a destination and some sort of message
+            if (ev.params.length <= 1) return;
 
-        destination = ev.params[0];
-        ev.params.shift();
+            destination = ev.params[0];
+            ev.params.shift();
 
-        kiwi.gateway.notice(destination, ev.params.join(' '));
-    }
+            kiwi.gateway.notice(destination, ev.params.join(' '));
+        }
 
-    function quoteCommand (ev) {
-        var raw = ev.params.join(' ');
-        kiwi.gateway.raw(raw);
-    }
+        function quoteCommand (ev) {
+            var raw = ev.params.join(' ');
+            kiwi.gateway.raw(raw);
+        }
 
-    function kickCommand (ev) {
-        var nick, panel = kiwi.app.panels.active;
+        function kickCommand (ev) {
+            var nick, panel = kiwi.app.panels.active;
 
-        if (!panel.isChannel()) return;
+            if (!panel.isChannel()) return;
 
-        // Make sure we have a nick
-        if (ev.params.length === 0) return;
+            // Make sure we have a nick
+            if (ev.params.length === 0) return;
 
-        nick = ev.params[0];
-        ev.params.shift();
+            nick = ev.params[0];
+            ev.params.shift();
 
-        kiwi.gateway.kick(panel.get('name'), nick, ev.params.join(' '));
-    }
+            kiwi.gateway.kick(panel.get('name'), nick, ev.params.join(' '));
+        }
 
-    function settingsCommand (ev) {
-        var panel = new kiwi.model.Applet();
-        panel.load(new kiwi.applets.Settings());
-        
-        kiwi.app.panels.add(panel);
-        panel.view.show();
-    }
+        function settingsCommand (ev) {
+            var panel = new kiwi.model.Applet();
+            panel.load(new kiwi.applets.Settings());
+            
+            kiwi.app.panels.add(panel);
+            panel.view.show();
+        }
 
-    function appletCommand (ev) {
-        if (!ev.params[0]) return;
+        function appletCommand (ev) {
+            if (!ev.params[0]) return;
 
-        var panel = new kiwi.model.Applet();
+            var panel = new kiwi.model.Applet();
 
-        if (ev.params[1]) {
-            // Url and name given
-            panel.load(ev.params[0], ev.params[1]);
-        } else {
-            // Load a pre-loaded applet
-            if (kiwi.applets[ev.params[0]]) {
-                panel.load(new kiwi.applets[ev.params[0]]());
+            if (ev.params[1]) {
+                // Url and name given
+                panel.load(ev.params[0], ev.params[1]);
             } else {
-                kiwi.app.panels.server.addMsg('', 'Applet "' + ev.params[0] + '" does not exist');
-                return;
+                // Load a pre-loaded applet
+                if (kiwi.applets[ev.params[0]]) {
+                    panel.load(new kiwi.applets[ev.params[0]]());
+                } else {
+                    kiwi.app.panels.server.addMsg('', 'Applet "' + ev.params[0] + '" does not exist');
+                    return;
+                }
             }
+            
+            kiwi.app.panels.add(panel);
+            panel.view.show();
         }
-        
-        kiwi.app.panels.add(panel);
-        panel.view.show();
-    }
 
 
 
 
 
-    this.isChannelName = function (channel_name) {
-        var channel_prefix = kiwi.gateway.get('channel_prefix');
+        this.isChannelName = function (channel_name) {
+            var channel_prefix = kiwi.gateway.get('channel_prefix');
+
+            if (!channel_name || !channel_name.length) return false;
+            return (channel_prefix.indexOf(channel_name[0]) > -1);
+        };
 
-        if (!channel_name || !channel_name.length) return false;
-        return (channel_prefix.indexOf(channel_name[0]) > -1);
     };
 
 
-})());
+    model = Backbone.Model.extend(new model());
+
+    return new model(arguments);
+};