From fed91446fe347698326a7c5e8f89ccfef263db83 Mon Sep 17 00:00:00 2001 From: Darren Date: Mon, 1 Oct 2012 20:12:45 +0100 Subject: [PATCH] Reverting kiwi.model.Application backbone object --- client_backbone/dev/model_application.js | 8 ++------ client_backbone/index.html | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/client_backbone/dev/model_application.js b/client_backbone/dev/model_application.js index 7ed2cf6..48dc8a3 100755 --- a/client_backbone/dev/model_application.js +++ b/client_backbone/dev/model_application.js @@ -1,4 +1,4 @@ -kiwi.model.Application = function () { +kiwi.model.Application = Backbone.Model.extend(new (function () { // Set to a reference to this object within initialize() var that = null; @@ -86,13 +86,11 @@ kiwi.model.Application = function () { 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(); - console.log('panels', this.panels); this.controlbox = new kiwi.view.ControlBox({el: $('#controlbox')[0]}); this.bindControllboxCommands(this.controlbox); @@ -846,6 +844,4 @@ kiwi.model.Application = function () { }; - - return new (Backbone.Model.extend(this))(arguments); -}; +})()); diff --git a/client_backbone/index.html b/client_backbone/index.html index 76ca0c0..9fb30dd 100755 --- a/client_backbone/index.html +++ b/client_backbone/index.html @@ -186,7 +186,7 @@ // Override the kiwi_server to use. (Think: running on standalone client..) //kiwi_server: 'http://kiwiirc.com:80' }; - + // Start the app by either the dev or closed environment (kiwi && kiwi.global && kiwi.global.start(opts)) || (kiwi && kiwi.start(opts)); } -- 2.25.1