From 62b72f6bd11f5ad0a14be9ea3448403c91f90985 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Fri, 25 Oct 2013 12:53:40 +0100 Subject: [PATCH] Move browser-startup module initialisation to the end of startup --- core/modules/startup.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/modules/startup.js b/core/modules/startup.js index 606cb15d6..c20b42198 100755 --- a/core/modules/startup.js +++ b/core/modules/startup.js @@ -53,12 +53,6 @@ exports.startup = function() { $tw.wiki.addTiddler({title: storyTitle, text: "", list: story},$tw.wiki.getModificationFields()); // Host-specific startup if($tw.browser) { - // Call browser startup modules - $tw.modules.forEachModuleOfType("browser-startup",function(title,module) { - if(module.startup) { - module.startup(); - } - }); // Install the popup manager $tw.popup = new $tw.utils.Popup({ rootElement: document.body @@ -130,6 +124,12 @@ exports.startup = function() { param: "$:/messages/SaveInstructions" }); } + // Call browser startup modules + $tw.modules.forEachModuleOfType("browser-startup",function(title,module) { + if(module.startup) { + module.startup(); + } + }); } else { // On the server, start a commander with the command line arguments commander = new $tw.Commander(