aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2012-02-08 19:02:16 +0100
committerIgor Wiedler <igor@wiedler.ch>2012-03-31 02:09:24 +0200
commit628074bf7057ad5f9aff929d7c8cd85171ce60b8 (patch)
treee597dc84afc1a5ce6ac412b7a981f4f9df5dd0d6 /phpBB/assets
parentb100bb9a69982221e7244ac74dd1de421b6344bc (diff)
downloadforums-628074bf7057ad5f9aff929d7c8cd85171ce60b8.tar
forums-628074bf7057ad5f9aff929d7c8cd85171ce60b8.tar.gz
forums-628074bf7057ad5f9aff929d7c8cd85171ce60b8.tar.bz2
forums-628074bf7057ad5f9aff929d7c8cd85171ce60b8.tar.xz
forums-628074bf7057ad5f9aff929d7c8cd85171ce60b8.zip
[feature/ajax] Stylistic JavaScript adjustments
PHPBB3-10270
Diffstat (limited to 'phpBB/assets')
-rw-r--r--phpBB/assets/javascript/core.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 68f7cf4ed8..9c5f507bb8 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -61,8 +61,10 @@ phpbb.alert = function(title, msg, fadedark) {
e.stopPropagation();
});
dark.one('click', function(e) {
+ var fade;
+
div.find('.alert_close').unbind('click');
- var fade = (typeof fadedark !== 'undefined' && !fadedark) ? div : dark;
+ fade = (typeof fadedark !== 'undefined' && !fadedark) ? div : dark;
fade.fadeOut(phpbb.alert_time, function() {
div.hide();
});
@@ -261,6 +263,8 @@ phpbb.ajaxify = function(options, refresh, callback) {
*/
function return_handler(res)
{
+ var alert;
+
// Is a confirmation required?
if (typeof res.S_CONFIRM_ACTION === 'undefined')
{
@@ -268,7 +272,7 @@ phpbb.ajaxify = function(options, refresh, callback) {
// callbacks.
if (typeof res.MESSAGE_TITLE !== 'undefined')
{
- var alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
+ alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
}
else
{