From 6905d07638e62714013dcb9f7a81215f77a9ebb8 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 20 Jan 2016 12:25:47 +0100 Subject: [PATCH] uses jquery datepicker instead of html5 date field --- app/assets/javascripts/advanced_search.js.coffee | 15 +++++++++++++-- app/views/shared/_advanced_search.html.erb | 10 ++++++---- app/views/shared/_locale_switcher.html.erb | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/advanced_search.js.coffee b/app/assets/javascripts/advanced_search.js.coffee index 8bff7f996..a5e657633 100644 --- a/app/assets/javascripts/advanced_search.js.coffee +++ b/app/assets/javascripts/advanced_search.js.coffee @@ -10,12 +10,23 @@ App.AdvancedSearch = toggle_date_options: -> if $('#js-advanced-search-date-min').val() == 'custom' $('#js-custom-date').show() - $('#js-custom-date input').prop 'disabled', false + $( ".js-calendar" ).datepicker( "option", "disabled", false ) else $('#js-custom-date').hide() - $('#js-custom-date input').prop 'disabled', true + $( ".js-calendar" ).datepicker( "option", "disabled", true ) + + init_calendar: -> + locale = $('#js-locale').data('current-locale') + if locale == 'en' + locale = '' + + $('.js-calendar').datepicker + regional: locale + maxDate: "+0d" initialize: -> + App.AdvancedSearch.init_calendar() + if App.AdvancedSearch.advanced_search_terms() $('#js-advanced-search').show() App.AdvancedSearch.toggle_date_options() diff --git a/app/views/shared/_advanced_search.html.erb b/app/views/shared/_advanced_search.html.erb index 2f0233b53..68cf1441d 100644 --- a/app/views/shared/_advanced_search.html.erb +++ b/app/views/shared/_advanced_search.html.erb @@ -27,13 +27,15 @@ diff --git a/app/views/shared/_locale_switcher.html.erb b/app/views/shared/_locale_switcher.html.erb index c5c69bbe4..e0a550667 100644 --- a/app/views/shared/_locale_switcher.html.erb +++ b/app/views/shared/_locale_switcher.html.erb @@ -1,5 +1,5 @@ <% if I18n.available_locales.size > 1 %> -
+
<%= t("layouts.header.locale") %>