kiwi 'loaded' event firing in the correct place

diff --git a/client/src/app.js b/client/src/app.js
index ec0c34886fca6dfc333ad1d654a0369528828ebb..e7d643d626c28f6ac4e901e4d4070a9ce52ddf09 100644 (file)
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -242,10 +242,7 @@ _kiwi.global = {
     },\r
 \r
     start: function() {\r
-        _kiwi.global.events.emit('loaded')\r
-        .done(function() {\r
-            _kiwi.app.showStartup();\r
-        });\r
+        _kiwi.app.showStartup();\r
     },\r
 \r
     // Allow plugins to change the startup applet\r

diff --git a/client/src/models/application.js b/client/src/models/application.js
index b81b109090d18edf9c969dcc92676e17ed216810..7a97e3bf8c7209965c9902a9c4b459174b04bdba 100644 (file)
--- a/client/src/models/application.js
+++ b/client/src/models/application.js
@@ -70,6 +70,8 @@
             this.startup_applet = _kiwi.model.Applet.load(this.startup_applet_name, {no_tab: true});\r
             this.startup_applet.tab = this.view.$('.console');\r
             this.startup_applet.view.show();\r
+\r
+            _kiwi.global.events.emit('loaded');\r
         },\r
 \r
 \r