Reverting kiwi.model.Application backbone object

diff --git a/client_backbone/dev/model_application.js b/client_backbone/dev/model_application.js
index 7ed2cf6516ecfcbd76aa91f9168476390048125b..48dc8a3cd01a9fad8e58ab5d72f310a4480fd140 100755 (executable)
--- a/client_backbone/dev/model_application.js
+++ b/client_backbone/dev/model_application.js
@@ -1,4 +1,4 @@
-kiwi.model.Application = function () {\r
+kiwi.model.Application = Backbone.Model.extend(new (function () {\r
 \r
     // Set to a reference to this object within initialize()\r
     var that = null;\r
@@ -86,13 +86,11 @@ kiwi.model.Application = function () {
 \r
     this.initializeClient = function () {\r
         this.view = new kiwi.view.Application({model: this, el: this.get('container')});\r
-\r
         \r
         /**\r
          * Set the UI components up\r
          */\r
         this.panels = new kiwi.model.PanelList();\r
-        console.log('panels', this.panels);\r
 \r
         this.controlbox = new kiwi.view.ControlBox({el: $('#controlbox')[0]});\r
         this.bindControllboxCommands(this.controlbox);\r
@@ -846,6 +844,4 @@ kiwi.model.Application = function () {
     };\r
 \r
 \r
-\r
-    return new (Backbone.Model.extend(this))(arguments);\r
-};\r
+})());\r

diff --git a/client_backbone/index.html b/client_backbone/index.html
index 76ca0c0e19e41b3ab9aad0f9feb80dc9e17748a7..9fb30ddcc63e11d4fb7c51d782c5321063345f05 100755 (executable)
--- 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));
         }