mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

[ticket/10270] Increased the speed of the animations.

Browse Source 
PHPBB3-10270
This commit is contained in:
Callum Macrae 2011-08-24 22:53:26 +01:00 committed by Igor Wiedler
parent f85faf435d
commit 53201da98c
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
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(); loading_alert.fadeIn(200);
} }
else else
{ {
loading_alert.show(); loading_alert.show();
dark.fadeIn(function() { dark.fadeIn(200, 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(function() { fade.fadeOut(200, 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(function() { loading_alert.fadeOut(200, function() {
$(dark).append(div); $(dark).append(div);
div.fadeIn(); div.fadeIn(200);
}); });
} }
else if (dark.is(':visible')) else if (dark.is(':visible'))
{ {
$(dark).append(div); $(dark).append(div);
div.fadeIn(); div.fadeIn(200);
} }
else else
{ {
$(dark).append(div); $(dark).append(div);
div.show(); div.show();
dark.fadeIn(); dark.fadeIn(200);
} }
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(function() { fade.fadeOut(200, 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(function() { loading_alert.fadeOut(200, function() {
$(dark).append(div); $(dark).append(div);
div.fadeIn(); div.fadeIn(200);
}); });
} }
else if (dark.is(':visible')) else if (dark.is(':visible'))
{ {
$(dark).append(div); $(dark).append(div);
div.fadeIn(); div.fadeIn(200);
} }
else else
{ {
$(dark).append(div); $(dark).append(div);
div.show(); div.show();
dark.fadeIn(); dark.fadeIn(200);
} }
return div; return div;
@ -204,7 +204,7 @@ phpbb.ajaxify = function(options, refresh, callback) {
} }
else else
{ {
dark.fadeOut(); dark.fadeOut(200);
} }
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(function() { dark.fadeOut(200, function() {
alert.remove(); alert.remove();
}); });
}, res.REFRESH_DATA.time * 1000); }, res.REFRESH_DATA.time * 1000);
@ -249,7 +249,7 @@ phpbb.ajaxify = function(options, refresh, callback) {
} }
} }
var run_exception = typeof options.exception === 'function'; var run_exception = (typeof options.exception === 'function');
if (is_form) if (is_form)
{ {
act = /action\[([a-z]+)\]/.exec(this.name); act = /action\[([a-z]+)\]/.exec(this.name);