panel.addMsg moved to models/channel.js

Not every panel needs .addMsg such as applets.

diff --git a/client/assets/src/models/channel.js b/client/assets/src/models/channel.js
index 9134ad7067ef637bd5f4afbd1e4c1ee93cec26ec..06b9d38ab7ec3921b4ee0a5d0f166a89f040dd3e 100644 (file)
--- a/client/assets/src/models/channel.js
+++ b/client/assets/src/models/channel.js
@@ -47,5 +47,63 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
                 this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_channel_part').fetch(member.displayNick(true), msg), 'action part');\r
             }\r
         }, this);\r
+    },\r
+\r
+\r
+    addMsg: function (nick, msg, type, opts) {\r
+        var message_obj, bs, d,\r
+            scrollback = (parseInt(_kiwi.global.settings.get('scrollback'), 10) || 250);\r
+\r
+        opts = opts || {};\r
+\r
+        // Time defaults to now\r
+        if (!opts || typeof opts.time === 'undefined') {\r
+            d = opts.date = new Date();\r
+            opts.time = d.getHours().toString().lpad(2, "0") + ":" + d.getMinutes().toString().lpad(2, "0") + ":" + d.getSeconds().toString().lpad(2, "0");\r
+        }\r
+\r
+        // CSS style defaults to empty string\r
+        if (!opts || typeof opts.style === 'undefined') {\r
+            opts.style = '';\r
+        }\r
+\r
+        // Run through the plugins\r
+        message_obj = {"msg": msg, "date": opts.date, "time": opts.time, "nick": nick, "chan": this.get("name"), "type": type, "style": opts.style};\r
+        //tmp = _kiwi.plugs.run('addmsg', message_obj);\r
+        if (!message_obj) {\r
+            return;\r
+        }\r
+\r
+        // The CSS class (action, topic, notice, etc)\r
+        if (typeof message_obj.type !== "string") {\r
+            message_obj.type = '';\r
+        }\r
+\r
+        // Make sure we don't have NaN or something\r
+        if (typeof message_obj.msg !== "string") {\r
+            message_obj.msg = '';\r
+        }\r
+\r
+        // Update the scrollback\r
+        bs = this.get("scrollback");\r
+        if (bs) {\r
+            bs.push(message_obj);\r
+\r
+            // Keep the scrolback limited\r
+            if (bs.length > scrollback) {\r
+                bs.splice(scrollback);\r
+            }\r
+            this.set({"scrollback": bs}, {silent: true});\r
+        }\r
+\r
+        this.trigger("msg", message_obj);\r
+    },\r
+\r
+\r
+    clearMessages: function () {\r
+        this.set({'scrollback': []}, {silent: true});\r
+        this.addMsg('', 'Window cleared');\r
+\r
+        this.view.render();\r
     }\r
 });\r

diff --git a/client/assets/src/models/panel.js b/client/assets/src/models/panel.js
index fe413084b667f2f2991a1602f513faa5268c8c41..943658e7acdd697225545673afe79fd90317d201 100644 (file)
--- a/client/assets/src/models/panel.js
+++ b/client/assets/src/models/panel.js
@@ -8,63 +8,6 @@ _kiwi.model.Panel = Backbone.Model.extend({
         }, {"silent": true});\r
     },\r
 \r
-    addMsg: function (nick, msg, type, opts) {\r
-        var message_obj, bs, d,\r
-            scrollback = (parseInt(_kiwi.global.settings.get('scrollback'), 10) || 250);\r
-\r
-        opts = opts || {};\r
-\r
-        // Time defaults to now\r
-        if (!opts || typeof opts.time === 'undefined') {\r
-            d = opts.date = new Date();\r
-            opts.time = d.getHours().toString().lpad(2, "0") + ":" + d.getMinutes().toString().lpad(2, "0") + ":" + d.getSeconds().toString().lpad(2, "0");\r
-        }\r
-\r
-        // CSS style defaults to empty string\r
-        if (!opts || typeof opts.style === 'undefined') {\r
-            opts.style = '';\r
-        }\r
-\r
-        // Run through the plugins\r
-        message_obj = {"msg": msg, "date": opts.date, "time": opts.time, "nick": nick, "chan": this.get("name"), "type": type, "style": opts.style};\r
-        //tmp = _kiwi.plugs.run('addmsg', message_obj);\r
-        if (!message_obj) {\r
-            return;\r
-        }\r
-\r
-        // The CSS class (action, topic, notice, etc)\r
-        if (typeof message_obj.type !== "string") {\r
-            message_obj.type = '';\r
-        }\r
-\r
-        // Make sure we don't have NaN or something\r
-        if (typeof message_obj.msg !== "string") {\r
-            message_obj.msg = '';\r
-        }\r
-\r
-        // Update the scrollback\r
-        bs = this.get("scrollback");\r
-        if (bs) {\r
-            bs.push(message_obj);\r
-\r
-            // Keep the scrolback limited\r
-            if (bs.length > scrollback) {\r
-                bs.splice(scrollback);\r
-            }\r
-            this.set({"scrollback": bs}, {silent: true});\r
-        }\r
-\r
-        this.trigger("msg", message_obj);\r
-    },\r
-\r
-\r
-    clearMessages: function () {\r
-        this.set({'scrollback': []}, {silent: true});\r
-        this.addMsg('', 'Window cleared');\r
-\r
-        this.view.render();\r
-    },\r
-\r
     closePanel: function () {\r
         if (this.view) {\r
             this.view.unbind();\r

diff --git a/client/assets/src/models/server.js b/client/assets/src/models/server.js
index a275393b78965e4d79531667e0f7a824cfcfeb8a..f3017c22e46f9425c7d385ef79001c260b8b8c96 100644 (file)
--- a/client/assets/src/models/server.js
+++ b/client/assets/src/models/server.js
@@ -1,4 +1,4 @@
-_kiwi.model.Server = _kiwi.model.Panel.extend({\r
+_kiwi.model.Server = _kiwi.model.Channel.extend({\r
     // Used to determine if this is a server panel\r
     server: true,\r
 \r

diff --git a/server/httphandler.js b/server/httphandler.js
index 2cddc37c226b501fcf976ddb128ecbeae3d97c3d..a6b8893ba3439a51243a5a7abcef344e27f66317 100644 (file)
--- a/server/httphandler.js
+++ b/server/httphandler.js
@@ -238,11 +238,11 @@ function generateSettings(request, debug, callback) {
             [
                 'src/models/query.js',
                 'src/models/channel.js',
-                'src/models/server.js',
                 'src/models/applet.js'
             ],
 
             [
+                'src/models/server.js',     // Depends on models/channel.js
                 'src/applets/settings.js',
                 'src/applets/chanlist.js',
                 'src/applets/scripteditor.js'