diff options
| author | Callum Macrae <callum@lynxphp.com> | 2011-10-15 17:56:51 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:09:18 +0200 |
| commit | 6af205940325d048b047455d25165cc279f6fb56 (patch) | |
| tree | 7672489a91f9ec0e8f1021b1d7ab0a87963c677e /phpBB/assets/javascript | |
| parent | badb0c3e5a47fce3622dd9b2c1e5d4aacfd84076 (diff) | |
| download | forums-6af205940325d048b047455d25165cc279f6fb56.tar forums-6af205940325d048b047455d25165cc279f6fb56.tar.gz forums-6af205940325d048b047455d25165cc279f6fb56.tar.bz2 forums-6af205940325d048b047455d25165cc279f6fb56.tar.xz forums-6af205940325d048b047455d25165cc279f6fb56.zip | |
[ticket/10270] DRYed alert fades in core.js.
PHPBB3-10270
Diffstat (limited to 'phpBB/assets/javascript')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 3aeabd7454..335eab012f 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -1,4 +1,5 @@ var phpbb = {}; +phpbb.alert_time = 100; (function($) { // Avoid conflicts with other libraries @@ -18,12 +19,12 @@ var dark = $('#darkenwrapper'), phpbb.loading_alert = function() { if (dark.is(':visible')) { - loading_alert.fadeIn(100); + loading_alert.fadeIn(phpbb.alert_time); } else { loading_alert.show(); - dark.fadeIn(100, function() { + dark.fadeIn(phpbb.alert_time, function() { setTimeout(function() { if (loading_alert.is(':visible')) { @@ -57,7 +58,7 @@ phpbb.alert = function(title, msg, fadedark) { }); dark.one('click', function(e) { var fade = (typeof fadedark !== 'undefined' && !fadedark) ? div : dark; - fade.fadeOut(100, function() { + fade.fadeOut(phpbb.alert_time, function() { div.hide(); }); return false; @@ -77,21 +78,21 @@ phpbb.alert = function(title, msg, fadedark) { if (loading_alert.is(':visible')) { - loading_alert.fadeOut(100, function() { + loading_alert.fadeOut(phpbb.alert_time, function() { dark.append(div); - div.fadeIn(100); + div.fadeIn(phpbb.alert_time); }); } else if (dark.is(':visible')) { dark.append(div); - div.fadeIn(100); + div.fadeIn(phpbb.alert_time); } else { dark.append(div); div.show(); - dark.fadeIn(100); + dark.fadeIn(phpbb.alert_time); } return div; @@ -119,7 +120,7 @@ phpbb.confirm = function(msg, callback, fadedark) { div.find('input[type="button"]').one('click', function() { var res = this.className === 'button1'; var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark; - fade.fadeOut(100, function() { + fade.fadeOut(phpbb.alert_time, function() { div.hide(); }); div.find('input[type="button"]').unbind('click'); @@ -129,7 +130,7 @@ phpbb.confirm = function(msg, callback, fadedark) { dark.one('click', function(e) { var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark; - fade.fadeOut(100, function() { + fade.fadeOut(phpbb.alert_time, function() { div.hide(); }); callback(false); @@ -153,21 +154,21 @@ phpbb.confirm = function(msg, callback, fadedark) { if (loading_alert.is(':visible')) { - loading_alert.fadeOut(100, function() { + loading_alert.fadeOut(phpbb.alert_time, function() { dark.append(div); - div.fadeIn(100); + div.fadeIn(phpbb.alert_time); }); } else if (dark.is(':visible')) { dark.append(div); - div.fadeIn(100); + div.fadeIn(phpbb.alert_time); } else { dark.append(div); div.show(); - dark.fadeIn(100); + dark.fadeIn(phpbb.alert_time); } return div; @@ -241,7 +242,7 @@ phpbb.ajaxify = function(options, refresh, callback) { } else { - dark.fadeOut(100); + dark.fadeOut(phpbb.alert_time); } if (typeof phpbb.ajax_callbacks[callback] === 'function') @@ -266,7 +267,7 @@ phpbb.ajaxify = function(options, refresh, callback) { window.location = res.REFRESH_DATA.url; } - dark.fadeOut(100, function() { + dark.fadeOut(phpbb.alert_time, function() { alert.hide(); }); }, res.REFRESH_DATA.time * 1000); |