From 4c0c3c0bef43fcaf831f82bd00ee90261408bfbd Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 29 Dec 2017 21:09:19 +0100 Subject: Show max warning comment lenth again Fixes #7414 Since we no longer use an input field we have to use text instead of val. Signed-off-by: Roeland Jago Douma --- apps/comments/js/commentstabview.js | 2 +- apps/comments/tests/js/commentstabviewSpec.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apps') diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js index 9b75cb4671e..bd89c8bbb49 100644 --- a/apps/comments/js/commentstabview.js +++ b/apps/comments/js/commentstabview.js @@ -512,7 +512,7 @@ _onTypeComment: function(ev) { var $field = $(ev.target); - var len = $field.val().length; + var len = $field.text().length; var $submitButton = $field.data('submitButtonEl'); if (!$submitButton) { $submitButton = $field.closest('form').find('.submit'); diff --git a/apps/comments/tests/js/commentstabviewSpec.js b/apps/comments/tests/js/commentstabviewSpec.js index 813b2a72eae..0131bc7bce3 100644 --- a/apps/comments/tests/js/commentstabviewSpec.js +++ b/apps/comments/tests/js/commentstabviewSpec.js @@ -411,7 +411,7 @@ describe('OCA.Comments.CommentsTabView tests', function() { expect($message.hasClass('error')).toEqual(false); }); it('displays tooltip when limit is almost reached', function() { - $message.val(createMessageWithLength(view._commentMaxLength - 2)); + $message.text(createMessageWithLength(view._commentMaxLength - 2)); $message.trigger('change'); expect(tooltipStub.calledWith('show')).toEqual(true); @@ -419,7 +419,7 @@ describe('OCA.Comments.CommentsTabView tests', function() { expect($message.hasClass('error')).toEqual(false); }); it('displays tooltip and disabled button when limit is exceeded', function() { - $message.val(createMessageWithLength(view._commentMaxLength + 2)); + $message.text(createMessageWithLength(view._commentMaxLength + 2)); $message.trigger('change'); expect(tooltipStub.calledWith('show')).toEqual(true); -- cgit v1.2.3