Merge commit 'upstream/master'

[friendica.git] / js / main.js

diff --git a/js/main.js b/js/main.js
old mode 100644 (file)
new mode 100755 (executable)
index a156dba..744691b
--- 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({
@@ -88,6 +106,8 @@
 
                /* notifications template */
                var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
+               var notifications_all = unescape($('<div>').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack
+               var notifications_mark = unescape($('<div>').append( $("#nav-notifications-mark-all").clone() ).html()); //outerHtml hack
                var notifications_empty = unescape($("#nav-notifications-menu").html());
                
                /* nav update event  */
@@ -112,23 +132,23 @@
 
                        var eNotif = $(data).find('notif')
                        notif = eNotif.attr('count');
-                       if (notif>0){
+                       if (notif>=0){
                                $("#nav-notifications-linkmenu").addClass("on");
                                nnm = $("#nav-notifications-menu");
                                
-                               nnm.html("<li><a href='"+baseurl+"/notifications/network'>Show All Notifications</a></li>");
+                               nnm.html(notifications_all + notifications_mark);
                                
                                //nnm.attr('popup','true');
                                eNotif.children("note").each(function(){
                                        e = $(this);
                                        text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
-                                       html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'));
+                                       html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
                                        nnm.append(html);
                                });
                                
                        } else {
-                               $("#nav-notifications-linkmenu").removeClass("on");
-                               $("#nav-notifications-menu").html(notifications_empty);
+                               //                              $("#nav-notifications-linkmenu").removeClass("on");
+                               //              $("#nav-notifications-menu").html(notifications_empty);
                        }
                        if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
                        $('#notify-update').html(notif);
@@ -149,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) {
@@ -290,7 +316,7 @@
                                $('body').css('cursor', 'auto');
                        }
                        /* autocomplete @nicknames */
-                       $(".comment-edit-wrapper  textarea").contact_autocomplete(baseurl+"/acl");
+                       $(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
                });
        }
 
@@ -484,9 +510,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');                              
                });
@@ -517,6 +543,14 @@ function checkboxhighlight(box) {
   }
 }
 
+function notifyMarkAll() {
+       $.get('notify/mark/all', function(data) {
+               if(timer) clearTimeout(timer);
+               timer = setTimeout(NavUpdate,1000);
+       });
+}
+
+
 function setupFieldRichtext(){
        tinyMCE.init({
                theme : "advanced",
@@ -563,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