From 5d7ce0011aea8d773b8aa0bd5451f092098493b4 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 19 Mar 2015 14:21:23 -0400 Subject: [PATCH] no need for setTimeout in ajaxify --- public/src/ajaxify.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 0c4e191532..2743405524 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -135,19 +135,17 @@ $(document).ready(function() { templates.parse(tpl_url, data, function(template) { translator.translate(template, function(translatedTemplate) { - setTimeout(function() { - $('#content').html(translatedTemplate); + $('#content').html(translatedTemplate); - ajaxify.end(url, tpl_url); + ajaxify.end(url, tpl_url); - if (typeof callback === 'function') { - callback(); - } + if (typeof callback === 'function') { + callback(); + } - $('#content, #footer').removeClass('ajaxifying'); + $('#content, #footer').removeClass('ajaxifying'); - app.refreshTitle(url); - }, animationDuration * 1000 - ((new Date()).getTime() - startTime)); + app.refreshTitle(url); }); }); }