aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets
diff options
context:
space:
mode:
authorVjacheslav Trushkin <cyberalien@gmail.com>2013-10-19 02:18:22 +0300
committerVjacheslav Trushkin <cyberalien@gmail.com>2013-10-19 02:18:22 +0300
commit18d505c171648b8c871ad91886484b569cd1196f (patch)
treee101555c6c0c9f03058956f32193ccc3259b797e /phpBB/assets
parent852b707b48cef513318d52db1d2a5f40621636d6 (diff)
downloadforums-18d505c171648b8c871ad91886484b569cd1196f.tar
forums-18d505c171648b8c871ad91886484b569cd1196f.tar.gz
forums-18d505c171648b8c871ad91886484b569cd1196f.tar.bz2
forums-18d505c171648b8c871ad91886484b569cd1196f.tar.xz
forums-18d505c171648b8c871ad91886484b569cd1196f.zip
[ticket/11947] Notification link fixes
Allow clicking child elements of link that toggles notification popup PHPBB3-11947
Diffstat (limited to 'phpBB/assets')
-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 = {};