From d6c78469addb9a046facfe46a0831ccbd771ea67 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Tue, 9 Feb 2016 18:31:37 +0100
Subject: [PATCH] searchableSelect: fix autocomp. pos and

---
 .../app/lib/app_post/searchable_select.coffee | 20 ++++++++++++++-----
 app/assets/stylesheets/zammad.scss            |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/app/lib/app_post/searchable_select.coffee b/app/assets/javascripts/app/lib/app_post/searchable_select.coffee
index 7f6be4444..3c429192b 100644
--- a/app/assets/javascripts/app/lib/app_post/searchable_select.coffee
+++ b/app/assets/javascripts/app/lib/app_post/searchable_select.coffee
@@ -3,6 +3,7 @@ class App.SearchableSelect extends Spine.Controller
   events:
     'input .js-input':                  'onInput'
     'blur .js-input':                   'onBlur'
+    'focus .js-input':                  'onFocus'
     'click .js-option':                 'selectItem'
     'mouseenter .js-option':            'highlightItem'
     'shown.bs.dropdown':                'onDropdownShown'
@@ -97,14 +98,16 @@ class App.SearchableSelect extends Spine.Controller
       caretPosition = @invisiblePart.text().length + 1
 
     @input.val @suggestion
+    @shadowInput.val @suggestionValue
     @clearAutocomplete()
     @toggle()
 
     @input.prop('selectionStart', caretPosition)
     @input.prop('selectionEnd', caretPosition)
 
-  autocomplete: (text) ->
+  autocomplete: (value, text) ->
     @suggestion = text
+    @suggestionValue = value
     startIndex = text.indexOf(@query)
 
     if !@query or startIndex != 0
@@ -146,7 +149,12 @@ class App.SearchableSelect extends Spine.Controller
     @toggle()
 
   onBlur: ->
-    # @clearAutocomplete()
+    @clearAutocomplete()
+
+  onFocus: ->
+    textEnd = @input.val().length
+    @input.prop('selectionStart', textEnd)
+    @input.prop('selectionEnd', textEnd)
 
   onInput: (event) =>
     @toggle() if not @isOpen
@@ -163,12 +171,14 @@ class App.SearchableSelect extends Spine.Controller
         @textContent.match(regex)
       .removeClass 'is-hidden'
 
-    @highlightFirst()
+    @highlightFirst(true)
 
-  highlightFirst: ->
+  highlightFirst: (autocomplete) ->
     first = @option_items.removeClass('is-active').not('.is-hidden').first()
     first.addClass 'is-active'
-    @autocomplete first.text().trim()
+
+    if autocomplete
+      @autocomplete first.attr('data-value'), first.text().trim()
 
   highlightItem: (event) =>
     @option_items.removeClass('is-active')
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 3b54b8ab7..740eb5143 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -7041,7 +7041,7 @@ output {
   .searchableSelect-autocomplete {
     position: absolute;
     left: 13px;
-    top: 10px;
+    top: 11px;
     right: 37px;
     white-space: nowrap;
     overflow: hidden;