Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ticket zoom: full click area for textarea

Browse source
This commit is contained in:
Felix Niklas 2015-12-14 16:25:06 +01:00
parent 5ae7f06225
commit 8826b8c371
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee
View file

@ -18,8 +18,8 @@ class App.TicketZoomArticleNew extends App.Controller
'click .js-articleTypeItem': 'selectArticleType' 'click .js-articleTypeItem': 'selectArticleType'
'click .js-selectedArticleType': 'showSelectableArticleType' 'click .js-selectedArticleType': 'showSelectableArticleType'
'click .js-mail-inputs': 'stopPropagation' 'click .js-mail-inputs': 'stopPropagation'
'click .js-writeArea': 'stopPropagation' 'click .js-writeArea': 'propagateOpenTextarea'
'click .list-entry-type div': 'change_type' 'click .list-entry-type div': 'changeType'
'focus .js-textarea': 'openTextarea' 'focus .js-textarea': 'openTextarea'
constructor: -> constructor: ->
@ -217,9 +217,8 @@ class App.TicketZoomArticleNew extends App.Controller
) )
@subscribeIdTextModule = ticket.subscribe( callback ) @subscribeIdTextModule = ticket.subscribe( callback )
change_type: (e) -> changeType: (e) ->
$(e.target).addClass('active').siblings('.active').removeClass('active') $(e.target).addClass('active').siblings('.active').removeClass('active')
# store $(this).data('value')
toggleVisibility: (event) -> toggleVisibility: (event) ->
event.stopPropagation() event.stopPropagation()
@ -309,7 +308,12 @@ class App.TicketZoomArticleNew extends App.Controller
scrollToBottom: -> scrollToBottom: ->
@el.scrollParent().scrollTop @el.scrollParent().prop('scrollHeight') @el.scrollParent().scrollTop @el.scrollParent().prop('scrollHeight')
propagateOpenTextarea: (event) ->
event.stopPropagation()
@textarea.focus()
openTextarea: (event, withoutAnimation) => openTextarea: (event, withoutAnimation) =>
event.stopPropagation()
if @articleNewEdit.hasClass('is-open') if @articleNewEdit.hasClass('is-open')
return return

1
app/assets/stylesheets/zammad.scss
View file

@ -4588,6 +4588,7 @@ footer {
border-radius: 5px; border-radius: 5px;
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
cursor: text;
} }
.article-new .textBubble [contenteditable], .article-new .textBubble [contenteditable],