Merge remote branch 'friendica/master' into blog-like

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

diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
index 99e061a2fc7108e320a73887fece46ffc49f7d54..65a92c1845c3b92d738b41afa3bef4af1fb6a21a 100644 (file)
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -37,14 +37,32 @@ function insertFormatting(comment,BBcode,id) {
        return true;
 }
 
-function cmtBbOpen(id) {
-       $(".comment-edit-bb-" + id).show();
+function cmtBbOpen(comment, id) {
+       if($(comment).hasClass('comment-edit-text-full')) {
+               $(".comment-edit-bb-" + id).show();
+               return true;
+       }
+       return false;
+}
+function cmtBbClose(comment, id) {
+//     if($(comment).hasClass('comment-edit-text-empty')) {
+//             $(".comment-edit-bb-" + id).hide();
+//             return true;
+//     }
+       return false;
 }
-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(