From 67c5477fb2797d24f317a6f2545ed3423757bd5c Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 21 Jul 2014 17:30:57 -0400 Subject: [PATCH] testing transition speed change without waiting for widgets to render --- public/src/ajaxify.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 1cae130000..fad2c56c53 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -97,16 +97,6 @@ var ajaxify = ajaxify || {}; setTimeout(function() { $('#content').html(translatedTemplate); ajaxify.widgets.render(tpl_url, url, function() { - if (typeof callback === 'function') { - callback(); - } - - app.processPage(); - - $('#content, #footer').removeClass('ajaxifying'); - ajaxify.initialLoad = false; - - app.refreshTitle(url); $(window).trigger('action:ajaxify.end', {url: url}); }); @@ -115,6 +105,17 @@ var ajaxify = ajaxify || {}; $(window).trigger('action:ajaxify.contentLoaded', {url: url}); ajaxify.loadScript(tpl_url); + + if (typeof callback === 'function') { + callback(); + } + + app.processPage(); + + $('#content, #footer').removeClass('ajaxifying'); + ajaxify.initialLoad = false; + + app.refreshTitle(url); }, animationDuration * 1000 - ((new Date()).getTime() - startTime)) });