ticketZoom: remove clickCatcher, improve ux

app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee

@@ -18,19 +18,20 @@ class App.TicketZoomArticleNew extends App.Controller
     #'.recipient-list .list-arrow':       'recipientListArrow'
 
   events:
-    'click .js-toggleVisibility':     'toggleVisibility'
+    'click .js-toggleVisibility':    'toggleVisibility'
-    'click .js-articleTypeItem':      'selectArticleType'
+    'click .js-articleTypeItem':     'selectArticleType'
-    'click .js-selectedArticleType':  'showSelectableArticleType'
+    'click .js-selectedArticleType': 'showSelectableArticleType'
-    'click .recipient-picker':        'toggle_recipients'
+    'click .recipient-picker':       'toggle_recipients'
-    'click .recipient-list':          'stopPropagation'
+    'click .recipient-list':         'stopPropagation'
-    'click .list-entry-type div':     'change_type'
+    'click .js-mail-inputs':         'stopPropagation'
-    'submit .recipient-list form':    'add_recipient'
+    'click .js-writeArea':           'stopPropagation'
-    'focus .js-textarea':             'openTextarea'
+    'click .list-entry-type div':    'change_type'
-    'input .js-textarea':             'detectEmptyTextarea'
+    'submit .recipient-list form':   'add_recipient'
-    #'dragenter':                  'onDragenter'
+    'focus .js-textarea':            'openTextarea'
-    #'dragleave':                  'onDragleave'
+    #'dragenter':                    'onDragenter'
-    #'drop':                       'onFileDrop'
+    #'dragleave':                    'onDragleave'
-    #'change input[type=file]':    'onFilePick'
+    #'drop':                         'onFileDrop'
+    #'change input[type=file]':      'onFilePick'
 
   constructor: ->
     super
@@ -129,6 +130,9 @@ class App.TicketZoomArticleNew extends App.Controller
     if @subscribeIdTextModule
       App.Ticket.unsubscribe(@subscribeIdTextModule)
 
+    @(window).off 'click.ticket-zoom-select-type'
+    $(window).on 'click.ticket-zoom-textarea'
+
   render: ->
 
     ticket = App.Ticket.fullLocal( @ticket_id )
@@ -182,7 +186,6 @@ class App.TicketZoomArticleNew extends App.Controller
             @attachmentPlaceholder.addClass('hide')
             @attachmentUpload.removeClass('hide')
             @cancelContainer.removeClass('hide')
-            console.log('upload start')
 
           onAborted: =>
             @attachmentPlaceholder.removeClass('hide')
@@ -202,7 +205,6 @@ class App.TicketZoomArticleNew extends App.Controller
             @progressText.text('')
 
             @renderAttachment(response.data)
-            console.log('upload complete', response.data )
 
           # Called during upload progress, first parameter
           # is decimal value from 0 to 100.
@@ -212,7 +214,6 @@ class App.TicketZoomArticleNew extends App.Controller
             # hide cancel on 90%
             if parseInt(progress) >= 90
               @cancelContainer.addClass('hide')
-            console.log('uploadProgress ', parseInt(progress))
         )
     )
 
@@ -293,10 +294,10 @@ class App.TicketZoomArticleNew extends App.Controller
   add_recipient: (e) ->
     e.stopPropagation()
     e.preventDefault()
-    console.log 'add recipient', e
     # store recipient
 
-  toggleVisibility: ->
+  toggleVisibility: (event) ->
+    event.stopPropagation()
     if @articleNewEdit.hasClass 'is-public'
       @articleNewEdit
         .removeClass 'is-public'
@@ -311,26 +312,24 @@ class App.TicketZoomArticleNew extends App.Controller
 
       @$('[name=internal]').val ''
 
-  showSelectableArticleType: =>
+  showSelectableArticleType: (event) =>
+    event.stopPropagation()
     @el.find('.js-articleTypes').removeClass('is-hidden')
+    $(window).on 'click.ticket-zoom-select-type', @hideSelectableArticleType
 
-    @selectTypeCatcher = new App.ClickCatcher
+  selectArticleType: (event) =>
-      holder:      @el.offsetParent()
+    event.stopPropagation()
-      callback:    @hideSelectableArticleType
+    articleTypeToSet = $(event.target).closest('.pop-selectable').data('value')
-      zIndexScale: 6
-
-  selectArticleType: (e) =>
-    articleTypeToSet = $(e.target).closest('.pop-selectable').data('value')
     @setArticleType( articleTypeToSet )
     @hideSelectableArticleType()
 
-    @selectTypeCatcher.remove()
+    $(window).off 'click.ticket-zoom-select-type'
-    @selectTypeCatcher = null
 
   hideSelectableArticleType: =>
     @el.find('.js-articleTypes').addClass('is-hidden')
 
   setArticleType: (type) ->
+    wasScrolledToBottom = @isScrolledToBottom()
     @type = type
     @$('[name=type]').val(type)
     @articleNewEdit.attr('data-type', type)
@@ -377,11 +376,14 @@ class App.TicketZoomArticleNew extends App.Controller
     else
       @$('[data-name=body] [data-signature=true]').remove()
 
-  detectEmptyTextarea: =>
+    @scrollToBottom() if wasScrolledToBottom
-    if !@textarea.text().trim()
+
-      @addTextareaCatcher()
+  isScrolledToBottom: ->
-    else
+    console.log 'isScrolledToBottom', @el.scrollParent().scrollTop() + @el.scrollParent().height(), @el.scrollParent().prop('scrollHeight')
-      @removeTextareaCatcher()
+    return @el.scrollParent().scrollTop() + @el.scrollParent().height() is @el.scrollParent().prop('scrollHeight')
+
+  scrollToBottom: ->
+    @el.scrollParent().scrollTop @el.scrollParent().prop('scrollHeight')
 
   openTextarea: (event, withoutAnimation) =>
     if @articleNewEdit.hasClass('is-open')
@@ -400,7 +402,7 @@ class App.TicketZoomArticleNew extends App.Controller
       options:
         duration: duration
         easing: 'easeOutQuad'
-        complete: => @addTextareaCatcher()
+        complete: => $(window).on 'click.ticket-zoom-textarea', @closeTextarea
 
     @textBubble.velocity
       properties:
@@ -443,21 +445,9 @@ class App.TicketZoomArticleNew extends App.Controller
       options:
         duration: duration
 
-  addTextareaCatcher: =>
-    if @articleNewEdit.is(':visible')
-      @textareaCatcher = new App.ClickCatcher
-        holder:      @articleNewEdit.offsetParent()
-        callback:    @closeTextarea
-        zIndexScale: 4
-
-  removeTextareaCatcher: ->
-    return if !@textareaCatcher
-    @textareaCatcher.remove()
-    @textareaCatcher = null
-
   closeTextarea: =>
-    @removeTextareaCatcher()
     if !@textarea.text().trim() && !@attachments.length && not @isIE10()
+      $(window).off 'click.ticket-zoom-textarea'
 
       @textarea.velocity
         properties:

app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco

@@ -45,16 +45,16 @@
         <div class="formGroup-label">
           <label for=""><%- @T('To') %></label>
         </div>
-        <div class="controls"><input id="" type="text" name="to" value="<%= @article.to %>" class="form-control" required="required"></div>
+        <div class="controls"><input id="" type="text" name="to" value="<%= @article.to %>" class="form-control js-mail-inputs" required="required"></div>
       </div>
       <div class="input form-group">
         <div class="formGroup-label">
           <label for=""><%- @T('Cc') %></label>
         </div>
-        <div class="controls"><input id="" type="text" name="cc" value="<%= @article.cc %>" class="form-control"></div>
+        <div class="controls"><input id="" type="text" name="cc" value="<%= @article.cc %>" class="form-control js-mail-inputs"></div>
       </div>
 
-      <div class="textBubble">
+      <div class="textBubble js-writeArea">
         <div class="bubble-arrow"></div>
         <div class="js-textarea articleNewEdit-body" contenteditable="true" data-name="body"><%- @article.body %></div>
         <!-- .textBubble grows with textarea (and expanding clone) -->