From b9c64fcd65f58aa571d972029de9ec303ceb0ad3 Mon Sep 17 00:00:00 2001 From: Darren Date: Sat, 3 Nov 2012 22:09:01 +0000 Subject: [PATCH] Client: Query model for actual query windows Solved a bug on a previous hack to hide the nicklist --- client/assets/dev/build.js | 1 + client/assets/dev/model_application.js | 5 ++--- client/assets/dev/model_query.js | 12 ++++++++++++ client/assets/dev/view.js | 3 +-- client/index.html | 1 + 5 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 client/assets/dev/model_query.js diff --git a/client/assets/dev/build.js b/client/assets/dev/build.js index a8270fa..738d0d6 100644 --- a/client/assets/dev/build.js +++ b/client/assets/dev/build.js @@ -22,6 +22,7 @@ var src = concat([ __dirname + '/model_memberlist.js', __dirname + '/model_panel.js', __dirname + '/model_panellist.js', + __dirname + '/model_query.js', __dirname + '/model_channel.js', __dirname + '/model_server.js', __dirname + '/model_applet.js', diff --git a/client/assets/dev/model_application.js b/client/assets/dev/model_application.js index 916710d..5a8e413 100644 --- 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 panel = that.panels.getByName(event.nick); if (!panel) { - panel = new kiwi.model.Channel({name: event.nick}); + panel = new kiwi.model.Query({name: event.nick}); that.panels.add(panel); } @@ -796,8 +796,7 @@ kiwi.model.Application = function () { // 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}); - panel.set('members', undefined); + panel = new kiwi.model.Query({name: destination}); kiwi.app.panels.add(panel); } diff --git a/client/assets/dev/model_query.js b/client/assets/dev/model_query.js new file mode 100644 index 0000000..253cf5d --- /dev/null +++ b/client/assets/dev/model_query.js @@ -0,0 +1,12 @@ +kiwi.model.Query = kiwi.model.Panel.extend({ + initialize: function (attributes) { + var name = this.get("name") || "", + members; + + this.view = new kiwi.view.Channel({"model": this, "name": name}); + this.set({ + "name": name, + "scrollback": [] + }, {"silent": true}); + } +}); \ No newline at end of file diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js index b541498..1f57227 100644 --- a/client/assets/dev/view.js +++ b/client/assets/dev/view.js @@ -48,8 +48,7 @@ kiwi.view.UserBox = Backbone.View.extend({ }, queryClick: function (event) { - var panel = new kiwi.model.Channel({name: this.member.get('nick')}); - panel.set('members', undefined); + var panel = new kiwi.model.Query({name: this.member.get('nick')}); kiwi.app.panels.add(panel); panel.view.show(); }, diff --git a/client/index.html b/client/index.html index 11ffea6..f808e80 100644 --- 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' -- 2.25.1