[DO NOT MERGE] Switching between hide window and clear input when pressing 'escape' key

src/ui/dispatcher.coffee

@@ -117,6 +117,9 @@ handle 'togglemenu', ->
     mainWindow = remote.getCurrentWindow()
     if mainWindow.isMenuBarVisible() then mainWindow.setMenuBarVisibility(false) else mainWindow.setMenuBarVisibility(true)
 
+handle 'setescapeclearsinput', (value) ->
+    viewstate.setEscapeClearsInput(value)
+
 handle 'togglehidedockicon', ->
     viewstate.setHideDockIcon(not viewstate.hidedockicon)
 

src/ui/models/viewstate.coffee

@@ -29,6 +29,7 @@ module.exports = exp = {
     fontSize: localStorage.fontSize or 'medium'
     zoom: tryparse(localStorage.zoom ? "1.0")
     loggedin: false
+    escapeClearsInput: tryparse(localStorage.escapeClearsInput) or false
     showtray: tryparse(localStorage.showtray) or false
     hidedockicon: tryparse(localStorage.hidedockicon) or false
     startminimizedtotray: tryparse(localStorage.startminimizedtotray) or false
@@ -138,7 +139,7 @@ module.exports = exp = {
                         action 'settyping', STOPPED
                     , 6000
                 , 6000
-    
+
     setShowConvMin: (doshow) ->
         return if @showConvMin == doshow
         @showConvMin = localStorage.showConvMin = doshow
@@ -191,6 +192,10 @@ module.exports = exp = {
         document.querySelector('html').classList.add(localStorage.colorScheme)
         document.querySelector('html').classList.add(fontsize)
 
+    setEscapeClearsInput: (value) ->
+        @escapeClearsInput = localStorage.escapeClearsInput = value
+        updated 'viewstate'
+
     setShowTray: (value) ->
         @showtray = localStorage.showtray = value
 

src/ui/views/input.coffee

@@ -89,7 +89,15 @@ module.exports = view (models) ->
                 unless isModifierKey(e)
                     if e.keyCode == 27
                         e.preventDefault()
-                        action 'hideWindow'
+                        if models.viewstate.showtray && !models.viewstate.escapeClearsInput
+                            action 'hideWindow'
+                        else
+                            # must focus on field and then execute:
+                            #  - select all text in input
+                            #  - replace them with an empty string
+                            document.getElementById("message-input").focus()
+                            document.execCommand("selectAll", false)
+                            document.execCommand("insertText", false, "")
                     if e.keyCode == 13
                         e.preventDefault()
                         if models.viewstate.convertEmoji

src/ui/views/menu.coffee

@@ -312,6 +312,24 @@ templateView = (viewstate) ->
             enabled: not viewstate.hidedockicon
             checked:  viewstate.showtray
             click: -> action 'toggleshowtray'
+        }, {
+          label: 'Escape key behavior'
+          submenu: [
+              {
+                  label: 'Hides window'
+                  type: 'radio'
+                  enabled: viewstate.showtray
+                  checked: viewstate.showtray && !viewstate.escapeClearsInput
+                  click: -> action 'setescapeclearsinput', false
+              }
+              {
+                  label: 'Clears input' + if !viewstate.showtray then ' (default when tray is not showing)' else ''
+                  type: 'radio'
+                  enabled: viewstate.showtray
+                  checked: !viewstate.showtray || viewstate.escapeClearsInput
+                  click: -> action 'setescapeclearsinput', true
+              }
+          ]
         }
         if isDarwin
             {