Merge pull request #109 from beardy-unixer/6ae5962b009cfd88925eae721e24bf895e8b78d5

[friendica.git] / js / main.js

diff --git a/js/main.js b/js/main.js
index 4cb278ee8766ed7fc4f65a0e3dbe733b12499501..c20455ad14bd24f19cea4955168bd4b1b466becf 100755 (executable)
--- a/js/main.js
+++ b/js/main.js
@@ -89,6 +89,7 @@
                /* 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  */
@@ -113,23 +114,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(notifications_all);
+                               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);
@@ -291,7 +292,7 @@
                                $('body').css('cursor', 'auto');
                        }
                        /* autocomplete @nicknames */
-                       $(".comment-edit-wrapper  textarea").contact_autocomplete(baseurl+"/acl");
+                       $(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");
                });
        }
 
@@ -518,6 +519,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",