Merge develop into 0308-Notifications-restructure

[friendica.git] / view / theme / frio / templates / jot-header.tpl

diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl
index dc4bf32fc599d5728d41ddeee9de5674b3677bc5..7c8d502de6c82b29ed189751183fc54cb7c337bd 100644 (file)
--- a/view/theme/frio/templates/jot-header.tpl
+++ b/view/theme/frio/templates/jot-header.tpl
@@ -127,7 +127,7 @@ function initEditor(cb){
 
 function enableOnUser(){
        if (editor) return;
-       $(this).val("");
+       //$(this).val("");
        initEditor();
 }
 
@@ -143,8 +143,8 @@ function enableOnUser(){
        $(document).ready(function() {
 
                /* enable tinymce on focus and click */
-               //$("#profile-jot-text").focus(enableOnUser);
-               //$("#profile-jot-text").click(enableOnUser);
+               $("#profile-jot-text").focus(enableOnUser);
+               $("#profile-jot-text").click(enableOnUser);
 
                // When clicking on a forum in acl we should remove the profile jot textarea
                // default value before inserting the forum mention
@@ -400,10 +400,9 @@ function enableOnUser(){
                jotcache = $("#profile-jot-form");
 
                modal
-                       .find('#jot-modal-body')
+                       .find('#jot-modal-content')
                        .append(jotcache)
-                       .modal.show
-                       ;
+                       .modal.show;
        }
 
        // the following functions show/hide the specific jot content