Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / view / theme / slackr / theme.php

diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
index a5520fce5f03f3320248676d9aacefffc76ad5b3..9887008606dcd7603d0079a41f3106ed4f40bf1c 100644 (file)
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -14,7 +14,9 @@ function insertFormatting(comment,BBcode,id) {
                        $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                        $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                        openMenu("comment-edit-submit-wrapper-" + id);
-                                                               }
+                       $("#comment-edit-text-" + id).val(tmpStr);
+
+               }
 
        textarea = document.getElementById("comment-edit-text-" +id);
        if (document.selection) {
@@ -41,8 +43,17 @@ function cmtBbOpen(id) {
 function cmtBbClose(id) {
        $(".comment-edit-bb-" + id).hide();
 }
+
+function hidecal() {
+       if(editor) return;
+       $('.fc').hide();
+}
+
 $(document).ready(function() {
 
+       $("#profile-jot-text").focus(hidecal);
+       $("#profile-jot-text").click(hidecal);
+
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
 
 $('.group-edit-icon').hover(