aboutsummaryrefslogtreecommitdiffstats
path: root/js/main.js
diff options
context:
space:
mode:
authorVasudev Kamath <kamathvasudev@gmail.com>2012-05-05 20:48:16 +0530
committerVasudev Kamath <kamathvasudev@gmail.com>2012-05-05 20:48:16 +0530
commitb5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80 (patch)
tree74234775d723e33378059f2fa45fa80e3bc6ac43 /js/main.js
parent214ec91a3f2c5fec6cced93f669b3a9725f0e40a (diff)
parent8ae83201cf8f3c943972a8f246b7972aa640afb4 (diff)
downloadvolse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.tar.gz
volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.tar.bz2
volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.zip
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'js/main.js')
-rw-r--r--js/main.js16
1 files changed, 10 insertions, 6 deletions
diff --git a/js/main.js b/js/main.js
index ac238bf6a..6a2632441 100644
--- a/js/main.js
+++ b/js/main.js
@@ -73,7 +73,16 @@
setupFieldRichtext();
/* popup menus */
+ function close_last_popup_menu() {
+ if(last_popup_menu) {
+ last_popup_menu.hide();
+ last_popup_button.removeClass("selected");
+ last_popup_menu = null;
+ last_popup_button = null;
+ }
+ }
$('a[rel^=#]').click(function(e){
+ close_last_popup_menu();
menu = $( $(this).attr('rel') );
e.preventDefault();
e.stopPropagation();
@@ -90,12 +99,7 @@
return false;
});
$('html').click(function() {
- if(last_popup_menu) {
- last_popup_menu.hide();
- last_popup_button.removeClass("selected");
- last_popup_menu = null;
- last_popup_button = null;
- }
+ close_last_popup_menu();
});
// fancyboxes