aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-10-20 11:07:51 -0700
committerNils Adermann <naderman@naderman.de>2013-10-20 11:07:51 -0700
commit3b39a44b0079e5eb703db1c70ced2ee9b991503b (patch)
treeb118c50a5ef339bff218aa75177c9798d74d479e
parent667ccbcffb51391ecafe2c9be3341ff38075044d (diff)
parent18d505c171648b8c871ad91886484b569cd1196f (diff)
downloadforums-3b39a44b0079e5eb703db1c70ced2ee9b991503b.tar
forums-3b39a44b0079e5eb703db1c70ced2ee9b991503b.tar.gz
forums-3b39a44b0079e5eb703db1c70ced2ee9b991503b.tar.bz2
forums-3b39a44b0079e5eb703db1c70ced2ee9b991503b.tar.xz
forums-3b39a44b0079e5eb703db1c70ced2ee9b991503b.zip
Merge pull request #1799 from cyberalien/ticket/11947
[ticket/11947] Notification link fixes
-rw-r--r--phpBB/assets/javascript/core.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index cdba6f9d26..0ad5c1d6e7 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -510,11 +510,11 @@ $('#notification_list_button').click(function(e) {
e.preventDefault();
});
$('#phpbb').click(function(e) {
- var target = $(e.target);
+ var target = $(e.target);
- if (!target.is('#notification_list') && !target.is('#notification_list_button') && !target.parents().is('#notification_list')) {
- $('#notification_list').hide();
- }
+ if (!target.is('#notification_list, #notification_list_button') && !target.parents().is('#notification_list, #notification_list_button')) {
+ $('#notification_list').hide();
+ }
});
phpbb.ajaxCallbacks = {};