Merge commit 'upstream/master'

[friendica.git] / js / main.js

diff --git a/js/main.js b/js/main.js
index babd2a1c389cc985dee231d0587e0e0d100ac477..744691b6da5dd971de36bc189f172b4141d85eb8 100755 (executable)
--- a/js/main.js
+++ b/js/main.js
@@ -16,6 +16,7 @@
       document.getElementById(theID).style.display = "none" 
   }
 
+
        var src = null;
        var prev = null;
        var livetime = null;
@@ -28,13 +29,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 +46,7 @@
                        if (e.hasClass("ttleft")) pos="left";
                        if (e.hasClass("ttright")) pos="right";
                        e.tipTip({defaultPosition: pos, edgeOffset: 8});
-               });
+               });*/
                
                
                
@@ -76,8 +79,23 @@
                        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() {
+                       if(last_popup_menu) {
+                               last_popup_menu.hide();
+                               last_popup_button.removeClass("selected");
+                               last_popup_menu = null;
+                               last_popup_button = null;
+                       }
+               });
                
                // fancyboxes
                $("a.popupbox").fancybox({
@@ -151,6 +169,12 @@
                NavUpdate(); 
                // Allow folks to stop the ajax page updates with the pause/break key
                $(document).keydown(function(event) {
+                       if(event.keyCode == '8') {
+                               var target = event.target || event.srcElement;
+                               if (!/input|textarea/i.test(target.nodeName)) {
+                                       return false;
+                               }
+                       }
                        if(event.keyCode == '19' || (event.ctrlKey && event.which == '32')) {
                                event.preventDefault();
                                if(stopped == false) {
@@ -573,3 +597,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