Merge remote branch 'upstream/master'

[friendica.git] / js / main.js

diff --git a/js/main.js b/js/main.js
index c20455ad14bd24f19cea4955168bd4b1b466becf..defd1f951ae6ec194437122d2a92eb9d9360f8c2 100755 (executable)
--- 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({
@@ -486,9 +501,9 @@
         return a.join('');  
     }  
 
-       function groupChangeMember(gid,cid) {
+       function groupChangeMember(gid, cid, sec_token) {
                $('body .fakelink').css('cursor', 'wait');
-               $.get('group/' + gid + '/' + cid, function(data) {
+               $.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
                                $('#group-update-wrapper').html(data);
                                $('body .fakelink').css('cursor', 'auto');                              
                });
@@ -573,3 +588,10 @@ Array.prototype.remove = function(item) {
   return this.push.apply(this, rest);
 };
 
+function previewTheme(elm) {
+       theme = $(elm).val();
+       $.getJSON('pretheme?f=&theme=' + theme,function(data) {
+                       $('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><a href="' + data.img + '"><img src="' + data.img + '" width="320" height="240" alt="' + theme + '" /></a>');
+       });
+
+}
\ No newline at end of file