makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10270] Sped up animations of popups.

Browse source 
They were too slow and were hampering the user experience on boards with
a fast connection such as local boards.

PHPBB3-10270
This commit is contained in:
Callum Macrae 2011-09-11 15:54:03 +01:00 • committed by Igor Wiedler
parent 431a78f346
commit 8c0e72cd9e
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
phpBB/styles/script.js
View file

@ -15,12 +15,12 @@ var dark = $('#darkenwrapper'),
phpbb.loading_alert = function() { phpbb.loading_alert = function() {
if (dark.is(':visible')) if (dark.is(':visible'))
{ {
loading_alert.fadeIn(200); loading_alert.fadeIn(100);
} }
else else
{ {
loading_alert.show(); loading_alert.show();
dark.fadeIn(200, function() { dark.fadeIn(100, function() {
setTimeout(function() { setTimeout(function() {
if (loading_alert.is(':visible')) if (loading_alert.is(':visible'))
{ {
@ -52,7 +52,7 @@ phpbb.alert = function(title, msg, fadedark) {
}); });
$(dark).one('click', function(e) { $(dark).one('click', function(e) {
var fade = (typeof fadedark !== 'undefined' && !fadedark) ? div : dark; var fade = (typeof fadedark !== 'undefined' && !fadedark) ? div : dark;
fade.fadeOut(200, function() { fade.fadeOut(100, function() {
div.remove(); div.remove();
}); });
return false; return false;
@ -68,21 +68,21 @@ phpbb.alert = function(title, msg, fadedark) {
if (loading_alert.is(':visible')) if (loading_alert.is(':visible'))
{ {
loading_alert.fadeOut(200, function() { loading_alert.fadeOut(100, function() {
$(dark).append(div); $(dark).append(div);
div.fadeIn(200); div.fadeIn(100);
}); });
} }
else if (dark.is(':visible')) else if (dark.is(':visible'))
{ {
$(dark).append(div); $(dark).append(div);
div.fadeIn(200); div.fadeIn(100);
} }
else else
{ {
$(dark).append(div); $(dark).append(div);
div.show(); div.show();
dark.fadeIn(200); dark.fadeIn(100);
} }
return div; return div;
@ -107,7 +107,7 @@ phpbb.confirm = function(msg, callback, fadedark) {
div.find('.jalertbut').bind('click', function() { div.find('.jalertbut').bind('click', function() {
var res = this.value === 'Yes'; var res = this.value === 'Yes';
var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark; var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark;
fade.fadeOut(200, function() { fade.fadeOut(100, function() {
div.remove(); div.remove();
}); });
callback(res); callback(res);
@ -127,21 +127,21 @@ phpbb.confirm = function(msg, callback, fadedark) {
if (loading_alert.is(':visible')) if (loading_alert.is(':visible'))
{ {
loading_alert.fadeOut(200, function() { loading_alert.fadeOut(100, function() {
$(dark).append(div); $(dark).append(div);
div.fadeIn(200); div.fadeIn(100);
}); });
} }
else if (dark.is(':visible')) else if (dark.is(':visible'))
{ {
$(dark).append(div); $(dark).append(div);
div.fadeIn(200); div.fadeIn(100);
} }
else else
{ {
$(dark).append(div); $(dark).append(div);
div.show(); div.show();
dark.fadeIn(200); dark.fadeIn(100);
} }
return div; return div;
@ -204,7 +204,7 @@ phpbb.ajaxify = function(options, refresh, callback) {
} }
else else
{ {
dark.fadeOut(200); dark.fadeOut(100);
} }
if (typeof phpbb.ajax_callbacks[callback] === 'function') if (typeof phpbb.ajax_callbacks[callback] === 'function')
@ -229,7 +229,7 @@ phpbb.ajaxify = function(options, refresh, callback) {
window.location = res.REFRESH_DATA.url; window.location = res.REFRESH_DATA.url;
} }
dark.fadeOut(200, function() { dark.fadeOut(100, function() {
alert.remove(); alert.remove();
}); });
}, res.REFRESH_DATA.time * 1000); }, res.REFRESH_DATA.time * 1000);