From 77c84a91f48858e185247d85f508f4f4156d733f Mon Sep 17 00:00:00 2001
From: Darren <darren@darrenwhitlen.com>
Date: Tue, 9 Sep 2014 02:38:28 +0100
Subject: [PATCH] kiwi 'loaded' event firing in the correct place
---
client/src/app.js | 5 +----
client/src/models/application.js | 2 ++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/client/src/app.js b/client/src/app.js
index ec0c348..e7d643d 100644
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -242,10 +242,7 @@ _kiwi.global = {
},
start: function() {
- _kiwi.global.events.emit('loaded')
- .done(function() {
- _kiwi.app.showStartup();
- });
+ _kiwi.app.showStartup();
},
// Allow plugins to change the startup applet
diff --git a/client/src/models/application.js b/client/src/models/application.js
index b81b109..7a97e3b 100644
--- 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});
this.startup_applet.tab = this.view.$('.console');
this.startup_applet.view.show();
+
+ _kiwi.global.events.emit('loaded');
},
--
2.25.1