From c18def3c12e129685d5209b8592cb338c37fcbbe Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 18 Jan 2017 08:27:49 +0200 Subject: [PATCH] Fix admin area js #341 --- app/assets/javascripts/admin-manifest.coffee | 3 ++- app/assets/javascripts/admin/combobox.js | 9 +++++++++ app/assets/javascripts/admin/datepicker.js | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/admin/combobox.js create mode 100644 app/assets/javascripts/admin/datepicker.js diff --git a/app/assets/javascripts/admin-manifest.coffee b/app/assets/javascripts/admin-manifest.coffee index c386c45e6..21e44cbd5 100644 --- a/app/assets/javascripts/admin-manifest.coffee +++ b/app/assets/javascripts/admin-manifest.coffee @@ -9,5 +9,6 @@ #= require jquery-ui/datepicker #= require select2 #= require jquery.doubleScroll -#= require shared/general #= require admin/application +#= require admin/combobox +#= require admin/datepicker diff --git a/app/assets/javascripts/admin/combobox.js b/app/assets/javascripts/admin/combobox.js new file mode 100644 index 000000000..8670af2ba --- /dev/null +++ b/app/assets/javascripts/admin/combobox.js @@ -0,0 +1,9 @@ +var comboBoxFields = $('.js-combobox'); + +if (comboBoxFields.length) { + comboBoxFields.select2({ + width: "100%", + selectOnBlur: true, + dropdownAutoWidth: self === top + }); +} diff --git a/app/assets/javascripts/admin/datepicker.js b/app/assets/javascripts/admin/datepicker.js new file mode 100644 index 000000000..43029c117 --- /dev/null +++ b/app/assets/javascripts/admin/datepicker.js @@ -0,0 +1,3 @@ +$('.datepicker').datepicker({ + dateFormat: 'yy-mm-dd' +});