From 895557c409d216071b0d4b79a3daaac494a3ae07 Mon Sep 17 00:00:00 2001 From: Luc Donnet Date: Thu, 4 Dec 2014 14:12:37 +0100 Subject: [PATCH 1/2] Fix zindex for tokeninput in the javascript call --- app/inputs/search_stop_area_input.rb | 1 + app/inputs/search_time_table_input.rb | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/inputs/search_stop_area_input.rb b/app/inputs/search_stop_area_input.rb index aa5568541..e5cfafc34 100644 --- a/app/inputs/search_stop_area_input.rb +++ b/app/inputs/search_stop_area_input.rb @@ -38,6 +38,7 @@ def search }; $('##{dom_id}').tokenInput('#{options[:json]}', { + zindex: 1061, disabled: #{options[:disabled] || false}, crossDomain: false, tokenLimit: #{tokenLimit}, diff --git a/app/inputs/search_time_table_input.rb b/app/inputs/search_time_table_input.rb index 6f40d7e1e..b201d5221 100644 --- a/app/inputs/search_time_table_input.rb +++ b/app/inputs/search_time_table_input.rb @@ -19,6 +19,7 @@ def search tags + ''; }; $('##{dom_id}').tokenInput('#{options[:json]}', { + zindex: 1061, crossDomain: false, tokenLimit: #{tokenLimit}, minChars: 2, @@ -29,7 +30,7 @@ def search noResultsText: '#{options[:no_result_text]}', searchingText: '#{options[:searching_text]}', resultsFormatter: time_table_formatter, - tokenFormatter: time_table_formatter, + tokenFormatter: time_table_formatter, }); });").html_safe) end @@ -48,7 +49,7 @@ def input_html_options :required => nil, :autofocus => nil, :class => 'token-input', - 'data-model-name' => object.class.model_name.human + 'data-model-name' => object.class.model_name.human }) end From f96d76e33b5dade18e397158dc365096d1e5f3a0 Mon Sep 17 00:00:00 2001 From: Luc Donnet Date: Thu, 4 Dec 2014 14:15:41 +0100 Subject: [PATCH 2/2] Add space between day ends and day type in autocomplete timetabme --- app/inputs/search_time_table_input.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/inputs/search_time_table_input.rb b/app/inputs/search_time_table_input.rb index b201d5221..877333592 100644 --- a/app/inputs/search_time_table_input.rb +++ b/app/inputs/search_time_table_input.rb @@ -15,7 +15,7 @@ def search tags = '
' + item.tags + '
' ; } return '
  • ' + item.comment + - '
    ' + item.time_table_bounding + day_types + '
    ' + + '
    ' + item.time_table_bounding + ' ' + day_types + '
    ' + tags + '
  • '; }; $('##{dom_id}').tokenInput('#{options[:json]}', {