From fb0d922d736c47ce812d13178c8a8f8280d6ece3 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Fri, 5 Aug 2022 15:34:23 +0200 Subject: [PATCH] Remove datetimepicker directive + default values --- .../order_cycles/order_cycles.js.erb.coffee | 17 ----- app/assets/javascripts/admin/util.js.erb | 66 ------------------- 2 files changed, 83 deletions(-) diff --git a/app/assets/javascripts/admin/order_cycles/order_cycles.js.erb.coffee b/app/assets/javascripts/admin/order_cycles/order_cycles.js.erb.coffee index 9241517262..eef4dc44dc 100644 --- a/app/assets/javascripts/admin/order_cycles/order_cycles.js.erb.coffee +++ b/app/assets/javascripts/admin/order_cycles/order_cycles.js.erb.coffee @@ -1,21 +1,4 @@ angular.module('admin.orderCycles', ['ngTagsInput', 'admin.indexUtils', 'admin.enterprises']) - .directive 'datetimepicker', ($timeout, $parse) -> - require: "ngModel" - link: (scope, element, attrs, ngModel) -> - $timeout -> - fp = flatpickr(element, Object.assign({}, - window.FLATPICKR_DATETIME_DEFAULT, { - onOpen: (selectedDates, dateStr, instance) -> - instance.setDate(ngModel.$modelValue) - instance.input.dispatchEvent(new Event('focus', { bubbles: true })); - })); - fp.minuteElement.addEventListener "keyup", (e) -> - if !isNaN(event.target.value) - fp.setDate(fp.selectedDates[0].setMinutes(e.target.value), true) - fp.hourElement.addEventListener "keyup", (e) -> - if !isNaN(event.target.value) - fp.setDate(fp.selectedDates[0].setHours(e.target.value), true) - .directive 'ofnOnChange', -> (scope, element, attrs) -> element.bind 'change', -> diff --git a/app/assets/javascripts/admin/util.js.erb b/app/assets/javascripts/admin/util.js.erb index f06a5866d9..5da1fe404a 100644 --- a/app/assets/javascripts/admin/util.js.erb +++ b/app/assets/javascripts/admin/util.js.erb @@ -1,70 +1,4 @@ $(document).ready(function() { - var onClickButtons = function(index, fp) { - var date; - // Memorize index used for the 'Close' button - // (currently it has index of 1) - var closeButtonIndex = 1; - switch (index) { - case 0: - date = new Date(); - break; - case closeButtonIndex: - fp.close(); - break; - } - // Set the date unless clicked button was the 'Close' one - if (index != closeButtonIndex) { - fp.setDate(date, true); - } - } - window.FLATPICKR_DATE_DEFAULT = { - altInput: true, - altFormat: Spree.translations.flatpickr_date_format, - dateFormat: "Y-m-d", - locale: I18n.base_locale, - plugins: [ - ShortcutButtonsPlugin({ - button: [ - { - label: Spree.translations.today - }, - { - label: Spree.translations.close - } - ], - label: "or", - onClick: onClickButtons - }), - labelPlugin({}) - ] - } - window.FLATPICKR_DATETIME_DEFAULT = Object.assign( - {}, - window.FLATPICKR_DATE_DEFAULT, - { - altInput: true, - altFormat: Spree.translations.flatpickr_datetime_format, - dateFormat: "Y-m-d H:i", - enableTime: true, - time_24hr: true, - plugins: [ - ShortcutButtonsPlugin({ - button: [ - { - label: Spree.translations.now - }, - { - label: Spree.translations.close - } - ], - label: "or", - onClick: onClickButtons - }), - labelPlugin({}) - ] - } - ); - flatpickr(".datetimepicker", window.FLATPICKR_DATETIME_DEFAULT); $('a.close').click(function(event){ event.preventDefault(); $(this).parent().slideUp(250);