aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-06 04:07:10 -0800
committerfriendica <info@friendica.com>2013-01-06 04:07:10 -0800
commit7cd014e93ce1ebb2fded0bdcc093b982dd9ce57b (patch)
tree0cc189a3ae09f27204574dd56fc0294eec4d873d /js
parent6d9d07bdde4284906c1e0f1d2d7a05c87ed3d6e1 (diff)
downloadvolse-hubzilla-7cd014e93ce1ebb2fded0bdcc093b982dd9ce57b.tar.gz
volse-hubzilla-7cd014e93ce1ebb2fded0bdcc093b982dd9ce57b.tar.bz2
volse-hubzilla-7cd014e93ce1ebb2fded0bdcc093b982dd9ce57b.zip
make preview work fix some other nits
Diffstat (limited to 'js')
-rw-r--r--js/main.js19
1 files changed, 9 insertions, 10 deletions
diff --git a/js/main.js b/js/main.js
index 684a1d154..b184cd429 100644
--- a/js/main.js
+++ b/js/main.js
@@ -156,14 +156,15 @@
/* 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){
+ 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();
@@ -181,7 +182,7 @@
return false;
});
$('html').click(function() {
- close_last_popup_menu();
+ close_last_popup_menu();
});
// fancyboxes
@@ -547,8 +548,6 @@ function updateConvItems(mode,data) {
});
$("#nav-notifications-menu").show();
-
-
}