diff --git a/app/assets/javascripts/app/controllers/object_manager.coffee b/app/assets/javascripts/app/controllers/object_manager.coffee
index f489f3ffc..01e712761 100644
--- a/app/assets/javascripts/app/controllers/object_manager.coffee
+++ b/app/assets/javascripts/app/controllers/object_manager.coffee
@@ -7,7 +7,7 @@ treeParams = (e, params) ->
$(e.target).closest('.modal').find('.js-treeTable .js-key').each( ->
$element = $(@)
level = parseInt($element.attr('level'))
- name = $element.val()
+ name = $element.val().trim()
item =
name: name
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 0c4bb9669..f42052db6 100644
--- a/app/assets/javascripts/app/lib/app_post/searchable_select.coffee
+++ b/app/assets/javascripts/app/lib/app_post/searchable_select.coffee
@@ -40,29 +40,29 @@ class App.SearchableSelect extends Spine.Controller
@html App.view('generic/searchable_select')
attribute: @attribute
- options: @renderAllOptions '', @attribute.options, 0
- submenus: @renderSubmenus @attribute.options
+ options: @renderAllOptions('', @attribute.options, 0)
+ submenus: @renderSubmenus(@attribute.options)
# initial data
- @currentMenu = @findMenuContainingValue @attribute.value
- @level = @getIndex @currentMenu
+ @currentMenu = @findMenuContainingValue(@attribute.value)
+ @level = @getIndex(@currentMenu)
renderSubmenus: (options) ->
html = ''
if options
for option in options
if option.children
- html += App.view('generic/searchable_select_submenu')
+ html += App.view('generic/searchable_select_submenu')(
options: @renderOptions(option.children)
parentValue: option.value
title: option.name
-
+ )
if @hasSubmenu(option.children)
- html += @renderSubmenus option.children
+ html += @renderSubmenus(option.children)
html
updateAttributeValueName: ->
- firstSelected = _.find @attribute.options, (option) -> option.selected
+ firstSelected = _.find(@attribute.options, (option) -> option.selected)
if firstSelected
@attribute.valueName = firstSelected.name
@@ -70,7 +70,7 @@ class App.SearchableSelect extends Spine.Controller
else if @attribute.unknown && @attribute.value
@attribute.valueName = @attribute.value
else if @hasSubmenu @attribute.options
- @attribute.valueName = @getName @attribute.value, @attribute.options
+ @attribute.valueName = @getName(@attribute.value, @attribute.options)
hasSubmenu: (options) ->
return false if !options
@@ -83,7 +83,7 @@ class App.SearchableSelect extends Spine.Controller
if option.value is value
return option.name
if option.children
- name = @getName value, option.children
+ name = @getName(value, option.children)
return name if name isnt undefined
undefined
@@ -103,30 +103,31 @@ class App.SearchableSelect extends Spine.Controller
if level && level > 0
className += ' is-hidden is-child'
- html += App.view('generic/searchable_select_option')
+ html += App.view('generic/searchable_select_option')(
option: option
class: className
detail: parentName
+ )
if option.children
- html += @renderAllOptions "#{parentName} — #{option.name}", option.children, level+1
+ html += @renderAllOptions("#{parentName} — #{option.name}", option.children, level+1)
html
onDropdownShown: =>
- @input.on 'click', @stopPropagation
+ @input.on('click', @stopPropagation)
@highlightFirst()
if @level > 0
@showSubmenu(@currentMenu)
@isOpen = true
onDropdownHidden: =>
- @input.off 'click', @stopPropagation
+ @input.off('click', @stopPropagation)
@unhighlightCurrentItem()
@isOpen = false
if !@input.val()
@updateAttributeValueName()
- @input.val @attribute.valueName
+ @input.val(@attribute.valueName)
onKeyUp: =>
return if @input.val().trim() isnt ''
@@ -141,13 +142,13 @@ class App.SearchableSelect extends Spine.Controller
navigate: (event) =>
switch event.keyCode
- when 40 then @nudge event, 1 # down
- when 38 then @nudge event, -1 # up
- when 39 then @autocompleteOrNavigateIn event # right
- when 37 then @autocompleteOrNavigateOut event # left
- when 13 then @onEnter event
- when 27 then @onEscape event
- when 9 then @onTab event
+ when 40 then @nudge(event, 1) # down
+ when 38 then @nudge(event, -1) # up
+ when 39 then @autocompleteOrNavigateIn(event) # right
+ when 37 then @autocompleteOrNavigateOut(event) # left
+ when 13 then @onEnter(event)
+ when 27 then @onEscape(event)
+ when 9 then @onTab(event)
onEscape: ->
if @isOpen
@@ -204,8 +205,8 @@ class App.SearchableSelect extends Spine.Controller
# current position
caretPosition = @invisiblePart.text().length + 1
- @input.val @suggestion
- @shadowInput.val @suggestionValue
+ @input.val(@suggestion)
+ @shadowInput.val(@suggestionValue)
@clearAutocomplete()
@toggle()
@@ -250,7 +251,7 @@ class App.SearchableSelect extends Spine.Controller
target = @currentItem.attr('data-value')
target_menu = @optionsSubmenu.filter("[data-parent-value=\"#{target}\"]")
else
- target_menu = @findMenuContainingValue @currentMenu.attr('data-parent-value')
+ target_menu = @findMenuContainingValue(@currentMenu.attr('data-parent-value'))
@animateToSubmenu(target_menu, dir)
diff --git a/public/assets/tests/form_searchable_select.js b/public/assets/tests/form_searchable_select.js
index 72c1c23d4..81037e757 100644
--- a/public/assets/tests/form_searchable_select.js
+++ b/public/assets/tests/form_searchable_select.js
@@ -5,12 +5,21 @@ test( "searchable_select check", function() {
var el = $('#form1')
var defaults = {
searchable_select2: 'bbb',
+ searchable_select4: 'ccc',
}
var options = {
'aaa': 'aaa display',
'bbb': 'bbb display',
'ccc': 'ccc display',
}
+ var options_4_tree = [
+ { value: 'aaa', name: 'aaa display' },
+ { value: 'bbb', name: 'bbb display' },
+ { value: 'ccc', name: 'ccc display', children: [
+ { value: 'ccc::aaa', name: 'aaa display' },
+ { value: 'ccc::bbb', name: 'bbb display' },
+ ] },
+ ]
new App.ControllerForm({
el: el,
model: {
@@ -40,6 +49,15 @@ test( "searchable_select check", function() {
null: true,
unknown: true
},
+ {
+ name: 'searchable_select4',
+ display: 'SearchableSelect4',
+ tag: 'searchable_select',
+ options: options_4_tree,
+ default: defaults['searchable_select4'],
+ null: true,
+ unknown: true
+ },
]
},
autofocus: true
@@ -50,6 +68,7 @@ test( "searchable_select check", function() {
searchable_select1: '',
searchable_select2: 'bbb',
searchable_select3: '',
+ searchable_select4: 'ccc',
}
deepEqual(params, test_params, 'form param check')
@@ -67,6 +86,7 @@ test( "searchable_select check", function() {
searchable_select1: 'ccc',
searchable_select2: 'bbb',
searchable_select3: '',
+ searchable_select4: 'ccc',
}
deepEqual(params, test_params, 'form param check')
@@ -84,6 +104,7 @@ test( "searchable_select check", function() {
searchable_select1: 'ccc',
searchable_select2: 'ccc',
searchable_select3: '',
+ searchable_select4: 'ccc',
}
deepEqual(params, test_params, 'form param check')
@@ -110,7 +131,57 @@ test( "searchable_select check", function() {
searchable_select1: 'ccc',
searchable_select2: 'ccc',
searchable_select3: 'unknown value',
+ searchable_select4: 'ccc',
}
deepEqual(params, test_params, 'form param check')
+ $('#forms').append('
searchable_select check for .js-input field values
')
+ var el = $('#form2')
+ var defaults = {
+ searchable_select1: 'ccc::aaa',
+ searchable_select2: 'ccc::ccc',
+ }
+ var options = [
+ { value: 'aaa', name: 'aaa display' },
+ { value: 'bbb', name: 'bbb display' },
+ { value: 'ccc', name: 'ccc display', children: [
+ { value: 'ccc::aaa', name: 'aaa display L2' },
+ { value: 'ccc::bbb', name: 'bbb display L2' },
+ { value: 'ccc::ccc', name: 'ccc display L2' },
+ ] },
+ ]
+ new App.ControllerForm({
+ el: el,
+ model: {
+ configure_attributes: [
+ {
+ name: 'searchable_select1',
+ display: 'SearchableSelect1',
+ tag: 'searchable_select',
+ options: options,
+ default: defaults['searchable_select1'],
+ null: true,
+ },
+ {
+ name: 'searchable_select2',
+ display: 'SearchableSelect2',
+ tag: 'searchable_select',
+ options: options,
+ default: defaults['searchable_select2'],
+ null: true,
+ },
+ ]
+ },
+ })
+
+ var params = App.ControllerForm.params(el)
+ var test_params = {
+ searchable_select1: 'ccc::aaa',
+ searchable_select2: 'ccc::ccc',
+ }
+ deepEqual(params, test_params, 'form param check')
+ equal(el.find('[name="searchable_select1"].js-shadow + .js-input').val(), 'aaa display L2', 'verify shown input')
+ equal(el.find('[name="searchable_select2"].js-shadow + .js-input').val(), 'ccc display L2', 'verify shown input')
+
+
});