From 50a95cb62c627952f3812b0ad547c50593e17027 Mon Sep 17 00:00:00 2001 From: Darren Date: Sun, 30 Nov 2014 16:30:59 +0000 Subject: [PATCH] Refactor Application.panels --- client/src/models/application.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/client/src/models/application.js b/client/src/models/application.js index 99f835d..46a2262 100644 --- a/client/src/models/application.js +++ b/client/src/models/application.js @@ -109,7 +109,7 @@ initializeGlobals: function () { _kiwi.global.connections = this.connections; - _kiwi.global.panels = _.bind(this.panels, this); + _kiwi.global.panels = this.panels; _kiwi.global.panels.applets = this.applet_panels; _kiwi.global.components.Applet = _kiwi.model.Applet; @@ -136,24 +136,25 @@ var active_panel; var fn = function(panel_type) { - var panels; + var app = _kiwi.app, + panels; // Default panel type panel_type = panel_type || 'connections'; switch (panel_type) { case 'connections': - panels = this.connections.panels(); + panels = app.connections.panels(); break; case 'applets': - panels = this.applet_panels.models; + panels = app.applet_panels.models; break; } // Active panels / server panels.active = active_panel; - panels.server = this.connections.active_connection ? - this.connections.active_connection.panels.server : + panels.server = app.connections.active_connection ? + app.connections.active_connection.panels.server : null; return panels; -- 2.25.1