Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-09 23:45:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't ajaxify in until animation is completed; reduced minimum wait duration for preloader

Browse Source
This commit is contained in:
psychobunny
2014-07-21 15:49:22 -04:00
parent 9aeab08109
commit 2851a9a96b
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/src/ajaxify.js
View File

@@ -81,6 +81,8 @@ var ajaxify = ajaxify || {};
translator.load(tpl_url);
$('#footer, #content').removeClass('hide').addClass('ajaxifying');
var animationDuration = parseFloat($('#content').css('transition-duration')) || 0.2,
startTime = (new Date()).getTime();
ajaxify.variables.flush();
ajaxify.loadData(url, function(err, data) {
@@ -92,6 +94,7 @@ var ajaxify = ajaxify || {};
templates.parse(tpl_url, data, function(template) {
translator.translate(template, function(translatedTemplate) {
setTimeout(function() {
$('#content').html(translatedTemplate);
ajaxify.widgets.render(tpl_url, url, function() {
if (typeof callback === 'function') {
@@ -112,6 +115,8 @@ var ajaxify = ajaxify || {};
$(window).trigger('action:ajaxify.contentLoaded', {url: url});
ajaxify.loadScript(tpl_url);
}, ((new Date()).getTime() - startTime) - animationDuration * 100)
});
});
});
@@ -194,7 +199,7 @@ var ajaxify = ajaxify || {};
setTimeout(function() {
callback(null, ajaxify.preloader[url].data);
ajaxify.preloader[url] = null;
}, 100);
}, 50);
return;
}