Client: Query model for actual query windows

Solved a bug on a previous hack to hide the nicklist

diff --git a/client/assets/dev/build.js b/client/assets/dev/build.js
index a8270fa8146b0ce2f173af6fa24b199f064d1f9d..738d0d662b54a05689c4968c9299cf115962ef57 100644 (file)
--- a/client/assets/dev/build.js
+++ b/client/assets/dev/build.js
@@ -22,6 +22,7 @@ var src = concat([
     __dirname + '/model_memberlist.js',\r
     __dirname + '/model_panel.js',\r
     __dirname + '/model_panellist.js',\r
+    __dirname + '/model_query.js',\r
     __dirname + '/model_channel.js',\r
     __dirname + '/model_server.js',\r
     __dirname + '/model_applet.js',\r

diff --git a/client/assets/dev/model_application.js b/client/assets/dev/model_application.js
index 916710def8a0392d7ad9b2f0a974fdaae0773950..5a8e413127f5f74d4fa562e5d9c78f0b80bc4abb 100644 (file)
--- a/client/assets/dev/model_application.js
+++ b/client/assets/dev/model_application.js
@@ -330,7 +330,7 @@ kiwi.model.Application = function () {
                     // If a panel isn't found for this PM, create one\r
                     panel = that.panels.getByName(event.nick);\r
                     if (!panel) {\r
-                        panel = new kiwi.model.Channel({name: event.nick});\r
+                        panel = new kiwi.model.Query({name: event.nick});\r
                         that.panels.add(panel);\r
                     }\r
 \r
@@ -796,8 +796,7 @@ kiwi.model.Application = function () {
             // Check if we have the panel already. If not, create it\r
             panel = that.panels.getByName(destination);\r
             if (!panel) {\r
-                panel = new kiwi.model.Channel({name: destination});\r
-                panel.set('members', undefined);\r
+                panel = new kiwi.model.Query({name: destination});\r
                 kiwi.app.panels.add(panel);\r
             }\r
 \r

diff --git a/client/assets/dev/model_query.js b/client/assets/dev/model_query.js
new file mode 100644 (file)
index 0000000..253cf5d
--- /dev/null
+++ b/client/assets/dev/model_query.js
@@ -0,0 +1,12 @@
+kiwi.model.Query = kiwi.model.Panel.extend({\r
+    initialize: function (attributes) {\r
+        var name = this.get("name") || "",\r
+            members;\r
+\r
+        this.view = new kiwi.view.Channel({"model": this, "name": name});\r
+        this.set({\r
+            "name": name,\r
+            "scrollback": []\r
+        }, {"silent": true});\r
+    }\r
+});
\ No newline at end of file

diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index b54149818eb68288e0a109e4ce5cdb26e9be334a..1f57227e34b07c85fc58ebdd32785a0f0388f1cb 100644 (file)
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -48,8 +48,7 @@ kiwi.view.UserBox = Backbone.View.extend({
     },\r
 \r
     queryClick: function (event) {\r
-        var panel = new kiwi.model.Channel({name: this.member.get('nick')});\r
-        panel.set('members', undefined);\r
+        var panel = new kiwi.model.Query({name: this.member.get('nick')});\r
         kiwi.app.panels.add(panel);\r
         panel.view.show();\r
     },\r

diff --git a/client/index.html b/client/index.html
index 11ffea64e097bb973791751b21876e8af3744440..f808e804fab3d1c8c54909d1ad705ebe5581ec2f 100644 (file)
--- a/client/index.html
+++ b/client/index.html
@@ -189,6 +189,7 @@
                 ],
                 
                 [
+                    'dev/model_query.js',
                     'dev/model_channel.js',
                     'dev/model_server.js',
                     'dev/model_applet.js'