aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-03-23 14:09:06 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2012-03-23 14:09:06 +0100
commit1780fff1611809a6069603eceb643e210b4b3f36 (patch)
tree61dd6d3a8fc5368ad86b5d38a5d177ae9cd2d9f8 /js
parent82cc86a41a3a91e2d240286895184d2e7aa22a5e (diff)
downloadvolse-hubzilla-1780fff1611809a6069603eceb643e210b4b3f36.tar.gz
volse-hubzilla-1780fff1611809a6069603eceb643e210b4b3f36.tar.bz2
volse-hubzilla-1780fff1611809a6069603eceb643e210b4b3f36.zip
diabook: theme.php
remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links)
Diffstat (limited to 'js')
-rwxr-xr-xjs/main.js19
1 files changed, 17 insertions, 2 deletions
diff --git a/js/main.js b/js/main.js
index babd2a1c3..2b4b13791 100755
--- a/js/main.js
+++ b/js/main.js
@@ -28,13 +28,15 @@
var in_progress = false;
var langSelect = false;
var commentBusy = false;
+ var last_popup_menu = null;
+ var last_popup_button = null;
$(function() {
$.ajaxSetup({cache: false});
msie = $.browser.msie ;
- /* setup tooltips */
+ /* setup tooltips *//*
$("a,.tt").each(function(){
var e = $(this);
var pos="bottom";
@@ -43,7 +45,7 @@
if (e.hasClass("ttleft")) pos="left";
if (e.hasClass("ttright")) pos="right";
e.tipTip({defaultPosition: pos, edgeOffset: 8});
- });
+ });*/
@@ -76,8 +78,21 @@
if (menu.attr('popup')=="false") return false;
$(this).parent().toggleClass("selected");
menu.toggle();
+ if (menu.css("display") == "none") {
+ last_popup_menu = null;
+ last_popup_button = null;
+ } else {
+ last_popup_menu = menu;
+ last_popup_button = $(this).parent();
+ }
return false;
});
+ $('html').click(function() {
+ last_popup_menu.hide();
+ last_popup_button.removeClass("selected");
+ last_popup_menu = null;
+ last_popup_button = null;
+ });
// fancyboxes
$("a.popupbox").fancybox({