Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts

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

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 67e5eb6810748d4d3fe842f9c8872e8448f0ed29..64bcf27cab950b0a7aee1c38aa7201bbd016e417 100644 (file)
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -26,7 +26,7 @@ function initEditor(cb){
                        mode : "specific_textareas",
                        editor_selector: $editselect,
                        auto_focus: "profile-jot-text",
-                       plugins : "bbcode,paste,autoresize",
+                       plugins : "bbcode,paste,autoresize, inlinepopups",
                        theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
                        theme_advanced_buttons2 : "",
                        theme_advanced_buttons3 : "",
@@ -44,6 +44,7 @@ function initEditor(cb){
                        convert_urls: false,
                        content_css: "$baseurl/view/custom_tinymce.css",
                        theme_advanced_path : false,
+                       file_browser_callback : "fcFileBrowser",
                        setup : function(ed) {
                                cPopup = null;
                                ed.onKeyDown.add(function(ed,e) {
@@ -282,9 +283,9 @@ function enableOnUser(){
                                if(reply && reply.length) {
                                        commentBusy = true;
                                        $('body').css('cursor', 'wait');
-                                       $.get('filer/' + id + '?term=' + reply);
-                                       if(timer) clearTimeout(timer);
-                                       timer = setTimeout(NavUpdate,3000);
+                                       $.get('filer/' + id + '?term=' + reply, NavUpdate);
+//                                     if(timer) clearTimeout(timer);
+//                                     timer = setTimeout(NavUpdate,3000);
                                        liking = 1;
                                        $.fancybox.close();
                                } else {