aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets/javascript/core.js
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-03-04 00:22:15 +0100
committerMarc Alexander <admin@m-a-styles.de>2013-03-04 00:22:15 +0100
commitd26ad8ed2693b03a12eec4deec729e972579e5d9 (patch)
tree5e5089616cc4b398c1c698154ff5fdac8f6d1476 /phpBB/assets/javascript/core.js
parent8a9e1ca3f176946bc7b8ddb9be30ca8607685b80 (diff)
parentbee4f8d8185d4ff5278be758db4ea4a814f09b4f (diff)
downloadforums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar
forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar.gz
forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar.bz2
forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar.xz
forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts: phpBB/install/database_update.php
Diffstat (limited to 'phpBB/assets/javascript/core.js')
-rw-r--r--phpBB/assets/javascript/core.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 16ed04746d..9909359c2c 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -492,6 +492,19 @@ phpbb.timezonePreselectSelect = function(forceSelector) {
}
};
+// Toggle notification list
+$('#notification_list_button').click(function(e) {
+ $('#notification_list').toggle();
+ e.preventDefault();
+});
+$('#phpbb').click(function(e) {
+ var target = $(e.target);
+
+ if (!target.is('#notification_list') && !target.is('#notification_list_button') && !target.parents().is('#notification_list')) {
+ $('#notification_list').hide();
+ }
+});
+
phpbb.ajaxCallbacks = {};
/**