From 584347848b5c85200a649a834a6b9ecec3aa1905 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 28 Feb 2014 16:08:13 -0500 Subject: [PATCH] trigger action:ajaxify.start and action:ajaxify.end on cold load --- public/src/app.js | 53 ++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 621fd0f44c..3384243f33 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -597,27 +597,6 @@ var socket, }); }; - $('document').ready(function () { - $('#search-form').on('submit', function () { - var input = $(this).find('input'); - ajaxify.go("search/" + input.val()); - input.val(''); - return false; - }); - - $(window).blur(function(){ - app.isFocused = false; - }); - - $(window).focus(function(){ - app.isFocused = true; - - app.alternatingTitle(''); - }); - - createHeaderTooltips(); - }); - function exposeConfigToTemplates() { $(document).ready(function() { templates.setGlobal('relative_path', RELATIVE_PATH); @@ -646,6 +625,38 @@ var socket, }); } + + $('document').ready(function () { + var url = window.location.pathname.slice(1); + + $(window).trigger('action:ajaxify.start', { + url: url + }); + + $('#search-form').on('submit', function () { + var input = $(this).find('input'); + ajaxify.go("search/" + input.val()); + input.val(''); + return false; + }); + + $(window).blur(function(){ + app.isFocused = false; + }); + + $(window).focus(function(){ + app.isFocused = true; + + app.alternatingTitle(''); + }); + + createHeaderTooltips(); + + $(window).trigger('action:ajaxify.end', { + url: url + }); + }); + showWelcomeMessage = location.href.indexOf('loggedin') !== -1; app.loadConfig();