extending notifications to other types

[friendica.git] / view / jot-header.tpl

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index ecf27e1b179647b0643371c88d4726f6799b6536..ecfed6c423b23eb179cd45a4b0cc96c529e3bc93 100644 (file)
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -30,9 +30,26 @@ function initEditor(cb){
                        content_css: "$baseurl/view/custom_tinymce.css",
                        theme_advanced_path : false,
                        setup : function(ed) {
-                                //Character count
+                               cPopup = null;
+                               ed.onKeyDown.add(function(ed,e) {
+                                       if(cPopup !== null)
+                                               cPopup.onkey(e);
+                               });
+
                                ed.onKeyUp.add(function(ed, e) {
                                        var txt = tinyMCE.activeEditor.getContent();
+                                       match = txt.match(/@([^ \n]+)$/);
+                                       if(match!==null) {
+                                               if(cPopup === null) {
+                                                       cPopup = new ACPopup(this,baseurl+"/acl");
+                                               }
+                                               if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+                                               if(! cPopup.ready) cPopup = null;
+                                       }
+                                       else {
+                                               if(cPopup !== null) { cPopup.close(); cPopup = null; }
+                                       }
+
                                        textlen = txt.length;
                                        if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
                                                $('#profile-jot-desc').html(ispublic);
@@ -41,6 +58,8 @@ function initEditor(cb){
                                                $('#profile-jot-desc').html(' ');
                                        }        
 
+                                //Character count
+
                                        if(textlen <= 140) {
                                                $('#character-counter').removeClass('red');
                                                $('#character-counter').removeClass('orange');
@@ -71,8 +90,8 @@ function initEditor(cb){
                editor = true;
                // setup acl popup
                $("a#jot-perms-icon").fancybox({
-                       'transitionIn' : 'none',
-                       'transitionOut' : 'none'
+                       'transitionIn' : 'elastic',
+                       'transitionOut' : 'elastic'
                }); 
        } else {
                if (typeof cb!="undefined") cb();
@@ -203,8 +222,9 @@ function initEditor(cb){
                event.target.textContent = reply;
                event.preventDefault();
                if(reply && reply.length) {
+                       reply = bin2hex(reply);
                        $('#profile-rotator').show();
-                       $.get('parse_url?url=' + reply, function(data) {
+                       $.get('parse_url?binurl=' + reply, function(data) {
                                if (!editor) $("#profile-jot-text").val("");
                                initEditor(function(){
                                        tinyMCE.execCommand('mceInsertRawHTML',false,data);
@@ -215,14 +235,18 @@ function initEditor(cb){
        }
 
        function itemTag(id) {
-               $('#like-rotator-' + id).show();
                reply = prompt("$term");
                if(reply && reply.length) {
                        reply = reply.replace('#','');
                        if(reply.length) {
-                               $.get('tagger/' + id + '?term=' + reply, function(data) {
-                                       $('#like-rotator-' + id).hide();
-                               });
+
+                               commentBusy = true;
+                               $('body').css('cursor', 'wait');
+
+                               $.get('tagger/' + id + '?term=' + reply);
+                               if(timer) clearTimeout(timer);
+                               timer = setTimeout(NavUpdate,3000);
+                               liking = 1;
                        }
                }
        }