diff options
Diffstat (limited to 'js')
| -rwxr-xr-x | js/fk.autocomplete.js | 2 | ||||
| -rwxr-xr-x | js/main.js | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js index 85b51baeb..509466bd9 100755 --- a/js/fk.autocomplete.js +++ b/js/fk.autocomplete.js @@ -1,5 +1,5 @@ /** - * Friendika people autocomplete + * Friendica people autocomplete * * require jQuery, jquery.textareas */ diff --git a/js/main.js b/js/main.js index 4cb278ee8..3a10ae468 100755 --- 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 */ @@ -117,7 +118,7 @@ $("#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(){ @@ -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", |