diff --git a/nano/js/nano_base_helpers.js b/nano/js/nano_base_helpers.js index e9c49f5df04..90b29da1e0b 100644 --- a/nano/js/nano_base_helpers.js +++ b/nano/js/nano_base_helpers.js @@ -197,11 +197,7 @@ NanoBaseHelpers = function () } }; } (); - -$(document).ready(function() -{ - NanoBaseHelpers.init(); -}); + diff --git a/nano/js/nano_template.js b/nano/js/nano_template.js index cde883329dc..13588f9f728 100644 --- a/nano/js/nano_template.js +++ b/nano/js/nano_template.js @@ -58,8 +58,5 @@ var NanoTemplate = function () { } } }(); - -$(document).ready(function () { - NanoTemplate.init(); -}); + diff --git a/nano/js/nano_update.js b/nano/js/nano_update.js index 72d6755fe0e..02d507b5199 100644 --- a/nano/js/nano_update.js +++ b/nano/js/nano_update.js @@ -236,8 +236,4 @@ NanoUpdate = function () } }; } (); - -$(document).ready(function() -{ - NanoUpdate.init(); -}); \ No newline at end of file + diff --git a/nano/js/nano_utility.js b/nano/js/nano_utility.js index 6d93829883e..d54857a3473 100644 --- a/nano/js/nano_utility.js +++ b/nano/js/nano_utility.js @@ -6,13 +6,6 @@ var NanoUtility = function () return { init: function () { - if (typeof jQuery == 'undefined') { - alert('ERROR: Javascript library failed to load!'); - } - if (typeof doT == 'undefined') { - alert('ERROR: Template engine failed to load!'); - } - var body = $('body'); // We store data in the body tag, it's as good a place as any _urlParameters = body.data('urlParameters'); @@ -48,9 +41,22 @@ var NanoUtility = function () return queryString; } } -} (); +} (); -NanoUtility.init(); +if (typeof jQuery == 'undefined') { + alert('ERROR: Javascript library failed to load!'); +} +if (typeof doT == 'undefined') { + alert('ERROR: Template engine failed to load!'); +} + +// All scripts are initialised here, this allows control of init order +$(document).ready(function () { + NanoUtility.init(); + NanoTemplate.init(); + NanoBaseHelpers.init(); + NanoUpdate.init(); +}); if (!Array.prototype.indexOf) {