Show the app after plugins loaded; Allow custom startup applets;

[KiwiIRC.git] / client / src / index.html.tmpl

diff --git a/client/src/index.html.tmpl b/client/src/index.html.tmpl
index bf40fba57dcb56982b38fd6564c3de1dd5ba5355..7a5bdcfc0d664beab55d32c76291315233d92120 100644 (file)
--- a/client/src/index.html.tmpl
+++ b/client/src/index.html.tmpl
@@ -493,13 +493,23 @@
             // Kiwi IRC version this is built from\r
             kiwi.build_version = '<%build_version%>';\r
 \r
-            // Start the app\r
-            kiwi.start(opts, function() {\r
-                // Load any plugins\r
+            // Start the app after loading plugins\r
+            kiwi.init(opts, function() {\r
                 if (opts.client_plugins && opts.client_plugins.length > 0) {\r
+\r
+                    // Wait until all plugins are loaded before starting the app\r
+                    kiwi.plugins.once('loaded', function() {\r
+                        kiwi.start();\r
+                    });\r
+\r
                     _.each(opts.client_plugins, function (plugin_url) {\r
                         kiwi.plugins.load(plugin_url);\r
                     });\r
+\r
+                } else {\r
+\r
+                    // No plugins were needed so start the app\r
+                    kiwi.start();\r
                 }\r
             });\r
         });\r