From aea73298718f6e733df63b0fc21ae12883fb9617 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 19 Feb 2014 18:15:19 -0500 Subject: [PATCH] animate page load only after widgets load --- public/src/ajaxify.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index fcd045c5d5..94eaba4fb6 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -122,14 +122,15 @@ var ajaxify = {}; socket.emit('widgets.render', {template: tpl_url + '.tpl', location: location}, function(err, renderedWidgets) { area.html(templates.prepare(area.html()).parse({widgets: renderedWidgets})).removeClass('hidden'); + next(err); }); - }); - - $('#content, #footer').stop(true, true).removeClass('ajaxifying'); - ajaxify.initialLoad = false; + }, function(err) { + $('#content, #footer').stop(true, true).removeClass('ajaxifying'); + ajaxify.initialLoad = false; - app.refreshTitle(url); - $(window).trigger('action:ajaxify.end', { url: url }); + app.refreshTitle(url); + $(window).trigger('action:ajaxify.end', { url: url }); + }); }); }, url);