diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-08-16 10:32:35 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-08-16 10:32:35 +0200 |
| commit | 4a7384bc0ce1893a432bf4b7d67bca23796fe9db (patch) | |
| tree | 5623c66a3f66445284529d6207e4ab4a2edb2810 /view/js/main.js | |
| parent | c664a4bdcd1bd578f5ec3c2884f7c97e9f68d2d7 (diff) | |
| parent | 90bc21f2d560d879d7eaf05a85af6d6dca53ebac (diff) | |
| download | volse-hubzilla-4a7384bc0ce1893a432bf4b7d67bca23796fe9db.tar.gz volse-hubzilla-4a7384bc0ce1893a432bf4b7d67bca23796fe9db.tar.bz2 volse-hubzilla-4a7384bc0ce1893a432bf4b7d67bca23796fe9db.zip | |
Merge branch '2.6RC'2.6
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/view/js/main.js b/view/js/main.js index 38b9754a1..8f981fe31 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -13,6 +13,7 @@ function commentOpenUI(obj, id) { $("#comment-edit-text-" + id).attr('tabindex','9'); $("#comment-edit-submit-" + id).attr('tabindex','10'); $("#comment-tools-" + id).show(); + $("#comment-edit-anon-" + id).show(); } }; @@ -20,15 +21,20 @@ function commentOpenUI(obj, id) { } function commentCloseUI(obj, id) { - $(document).unbind( "click.commentClose", handler ); + var form_id = $(obj)[0].form.id; + + $('#' + form_id).on('click', function(e) { + $(document).unbind( "click.commentClose", handler ); + }); var handler = function() { - if(obj.value === '') { - obj.value = aStr.comment; + if($('#comment-edit-text-' + id).val() === '') { + $('#comment-edit-text-' + id).val(aStr.comment); $("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty"); $("#comment-edit-text-" + id).removeAttr('tabindex'); $("#comment-edit-submit-" + id).removeAttr('tabindex'); $("#comment-tools-" + id).hide(); + $("#comment-edit-anon-" + id).hide(); } }; @@ -41,7 +47,8 @@ function commentOpen(obj, id) { $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#mod-cmnt-wrap-" + id).show(); - openMenu("comment-tools-" + id); + $("#comment-tools-" + id).show(); + $("#comment-edit-anon-" + id).show(); return true; } return false; @@ -53,7 +60,8 @@ function commentClose(obj, id) { $("#comment-edit-text-" + id).removeClass("comment-edit-text-full"); $("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); $("#mod-cmnt-wrap-" + id).hide(); - closeMenu("comment-tools-" + id); + $("#comment-tools-" + id).hide(); + $("#comment-edit-anon-" + id).hide(); return true; } return false; @@ -373,7 +381,7 @@ function NavUpdate() { } else { $('#notifications-btn').css('opacity', 0.5); - $('#navbar-collapse-1').removeClass('in'); + $('#navbar-collapse-1').removeClass('show'); } if(data.network == 0) { |