From 14bbb9bedc52e2ae2417cc4b484f175779472d6d Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Tue, 1 Nov 2016 16:43:39 +0100 Subject: [PATCH] Add rows to textareas for notes/descriptions according to line breaks --- src/styles/_app_base.sass | 5 ----- src/templates/attract/layout.jade | 2 +- .../attract/shots/view_shot_embed.jade | 19 +++++++++++++++++-- .../attract/tasks/view_task_embed.jade | 2 -- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/styles/_app_base.sass b/src/styles/_app_base.sass index 29c97f6..922eeb8 100644 --- a/src/styles/_app_base.sass +++ b/src/styles/_app_base.sass @@ -480,8 +480,3 @@ input, input.form-control #comments-container margin-top: 0 - - #comments-container - .comment-reply-container - +container-box - padding: 10px 10px 20px 10px diff --git a/src/templates/attract/layout.jade b/src/templates/attract/layout.jade index 37b9db0..b0d1d13 100644 --- a/src/templates/attract/layout.jade +++ b/src/templates/attract/layout.jade @@ -24,7 +24,7 @@ html(lang="en") body("{% block bodyattrs %}{% if project %}data-project-url='{{ project.url }}'{% endif %}{% endblock %}") #app-main #col_sidebar - nav.sidebar(role="navigation") + nav.sidebar(role='navigation') ul li a.navbar-item.attract(href="{{ url_for('attract.index') }}", diff --git a/src/templates/attract/shots/view_shot_embed.jade b/src/templates/attract/shots/view_shot_embed.jade index 7e190bb..6e38c4b 100644 --- a/src/templates/attract/shots/view_shot_embed.jade +++ b/src/templates/attract/shots/view_shot_embed.jade @@ -13,9 +13,10 @@ | {% if 'PUT' in shot.allowed_methods %} .input-transparent-group - textarea.input-transparent( + textarea#item-description.input-transparent( name="description", type="text", + rows=1, placeholder='Description') {{ shot.description | hide_none }} .input-transparent-group @@ -27,9 +28,10 @@ | {% endfor %} .input-transparent-group - textarea.input-transparent( + textarea#item-notes.input-transparent( name="notes", type="text", + rows=1, placeholder='Notes') {{ shot.properties.notes | hide_none }} .input-group-separator @@ -118,3 +120,16 @@ script. loadComments("{{ url_for('nodes.comments_for_node', node_id=shot['_id']) }}"); $('.js-help').openModalUrl('Help', "{{ url_for('attract.help', project_url=project.url) }}"); + + /* Resize textareas */ + var textAreaFields = $('#item-description, #item-notes'); + + textAreaFields.each(function(){ + var descriptionText = $(this).val(), + matches = descriptionText.match(/\n/g), + breaks = matches ? matches.length : 2; + + if (descriptionText){ + $(this).attr('rows', breaks + 2); + } + }); diff --git a/src/templates/attract/tasks/view_task_embed.jade b/src/templates/attract/tasks/view_task_embed.jade index b53e13c..b50ed55 100644 --- a/src/templates/attract/tasks/view_task_embed.jade +++ b/src/templates/attract/tasks/view_task_embed.jade @@ -161,8 +161,6 @@ script. matches = descriptionText.match(/\n/g), breaks = matches ? matches.length : 2; - console.log(matches); - if (descriptionText){ descriptionField.attr('rows',breaks + 4); }