alchemy_cms 6.0.0.pre.rc3 → 6.0.0.pre.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21260eb0f68590cfe400b34ba5cbfe8d18551ed9fd2f6cc206bb5c7ed2aebb66
-  data.tar.gz: 870421eb1bbaf3c7b246de59379297f63f3719da3601e1ac07f8bb72877d6c0a
+  metadata.gz: da8076b5e01533899e6c3003841940160335389c6e8a961bedec1b08839f61ba
+  data.tar.gz: dfcd49629458243d86cb4bb49615da876b3e5bfb1b69de121f90fe6e98bb964c
 SHA512:
-  metadata.gz: 8056e9a0e2cebea3069b47405f60339e4dbb1af55399323a32f7298976e918318ec7e790674a273d84825c0416c6658127dba68c5596562e0f8687bb9cbcd56e
-  data.tar.gz: 438ee71b5721ccf34a713a9c6469c5cc1a383a1dd75f7534348cb25b9ef9f9dd668e59821e7d3c087c1f3cc3d86fbf121d5e7b0c07905dfcb2f4cd431005f13d
+  metadata.gz: a25f6e26595f7b7e218200a0a7dbc1e69ac175c1daa3736b443501f80c8f1012215c69ab2f17addeb61b397cb3288b018b87f8e175d1ec9c1399e38101018d7f
+  data.tar.gz: 1c8cee2a1c08c70581945e25dc0745ba9bf2dea83e44220e00a096fce531df941bea97405836dcc4cf650ede4e12162e7ab6b9dc18a8e297f4ac6f71a18643d6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 6.0.0-rc4 (2022-01-16)
+
+### Changes
+
+- Allow ransack 2.5.0 [#2223](https://github.com/AlchemyCMS/alchemy_cms/pull/2223) ([depfu](https://github.com/apps/depfu))
+- make the admin error tracker customizable [#2220](https://github.com/AlchemyCMS/alchemy_cms/pull/2220) ([DarkSwoop](https://github.com/DarkSwoop))
+- Update Flatpickr to 4.6.9 [#2197](https://github.com/AlchemyCMS/alchemy_cms/pull/2197) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 6.0.0-rc3 (2021-11-24)
 
 ### Changes

data/alchemy_cms.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "kaminari", ["~> 1.1"]
   gem.add_runtime_dependency "originator", ["~> 3.1"]
   gem.add_runtime_dependency "non-stupid-digest-assets", ["~> 1.0.8"]
-  gem.add_runtime_dependency "ransack", [">= 1.8", "< 2.4.2"] # 2.4.2 dropped Ruby 2.5 support in a patch level release
+  gem.add_runtime_dependency "ransack", [">= 1.8", "<= 2.5.0"] # 2.4.2 dropped Ruby 2.5 support in a patch level release
   gem.add_runtime_dependency "request_store", ["~> 1.2"]
   gem.add_runtime_dependency "responders", [">= 2.0", "< 4.0"]
   gem.add_runtime_dependency "sassc-rails", ["~> 2.1"]

data/app/assets/javascripts/alchemy/admin.js

@@ -22,7 +22,6 @@
 //= require alchemy/alchemy.dialog
 //= require alchemy/alchemy.char_counter
 //= require alchemy/alchemy.confirm_dialog
-//= require alchemy/alchemy.datepicker
 //= require alchemy/alchemy.dirty
 //= require alchemy/alchemy.dragndrop
 //= require alchemy/alchemy.element_editors

data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee

@@ -6,7 +6,7 @@ Alchemy.GUI =
   # Initializes all Alchemy GUI elements in given scope
   init: (scope) ->
     Alchemy.SelectBox(scope)
-    Alchemy.Datepicker(scope)
+    Alchemy.Datepicker(scope && scope.selector)
     Alchemy.Tooltips(scope)
     Alchemy.Buttons.observe(scope)
     # Dialog links use event delegation and therefore do not
@@ -21,7 +21,7 @@ Alchemy.GUI =
 
   initElement: ($el) ->
     Alchemy.ElementDirtyObserver($el)
-    Alchemy.GUI.init($el)
+    Alchemy.GUI.init($el && $el.selector)
     Alchemy.ImageLoader($el[0])
     Alchemy.fileEditors($el.find(".essence_file, .essence_video, .essence_audio, .ingredient-editor.file, .ingredient-editor.audio, .ingredient-editor.video").selector)
     Alchemy.pictureEditors($el.find(".essence_picture, .ingredient-editor.picture").selector)

data/app/assets/stylesheets/alchemy/_extends.scss

@@ -37,8 +37,8 @@
 
   &[disabled],
   &.disabled,
-  &[readonly],
-  &.readonly {
+  &:not(.flatpickr-input)[readonly],
+  &:not(.flatpickr-input).readonly {
     color: $form-field-disabled-text-color;
     background-color: $form-field-disabled-bg-color;
     cursor: default;
@@ -49,8 +49,8 @@
     cursor: not-allowed;
   }
 
-  &[readonly],
-  &.readonly {
+  &:not(.flatpickr-input)[readonly],
+  &:not(.flatpickr-input).readonly {
     pointer-events: none;
   }
 }

data/app/assets/stylesheets/alchemy/flatpickr.scss

@@ -19,148 +19,137 @@
   -ms-touch-action: manipulation;
   touch-action: manipulation;
   background: $white;
-  -webkit-box-shadow: 1px 0 0 $medium-gray, -1px 0 0 $medium-gray, 0 1px 0 $medium-gray, 0 -1px 0 $medium-gray, 0 3px 13px rgba(0, 0, 0, 0.08);
-  box-shadow: 1px 0 0 $medium-gray, -1px 0 0 $medium-gray, 0 1px 0 $medium-gray, 0 -1px 0 $medium-gray, 0 3px 13px rgba(0, 0, 0, 0.08);
+  -webkit-box-shadow: 1px 0 0 $medium-gray, -1px 0 0 $medium-gray,
+    0 1px 0 $medium-gray, 0 -1px 0 $medium-gray, 0 3px 13px rgba(0, 0, 0, 0.08);
+  box-shadow: 1px 0 0 $medium-gray, -1px 0 0 $medium-gray, 0 1px 0 $medium-gray,
+    0 -1px 0 $medium-gray, 0 3px 13px rgba(0, 0, 0, 0.08);
 }
-
 .flatpickr-calendar.open,
 .flatpickr-calendar.inline {
   opacity: 1;
   max-height: 640px;
-  visibility: visible
+  visibility: visible;
 }
-
 .flatpickr-calendar.open {
   display: inline-block;
-  z-index: 99999
+  z-index: 99999;
 }
-
 .flatpickr-calendar.animate.open {
-  -webkit-animation: fpFadeInDown 300ms cubic-bezier(.23, 1, .32, 1);
-  animation: fpFadeInDown 300ms cubic-bezier(.23, 1, .32, 1)
+  -webkit-animation: fpFadeInDown 300ms cubic-bezier(0.23, 1, 0.32, 1);
+  animation: fpFadeInDown 300ms cubic-bezier(0.23, 1, 0.32, 1);
 }
-
 .flatpickr-calendar.inline {
   display: block;
   position: relative;
-  top: 2px
+  top: 2px;
 }
-
 .flatpickr-calendar.static {
   position: absolute;
   top: calc(100% + 2px);
 }
-
 .flatpickr-calendar.static.open {
   z-index: 999;
-  display: block
+  display: block;
 }
-
-.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+1) .flatpickr-day.inRange:nth-child(7n+7) {
+.flatpickr-calendar.multiMonth
+  .flatpickr-days
+  .dayContainer:nth-child(n + 1)
+  .flatpickr-day.inRange:nth-child(7n + 7) {
   -webkit-box-shadow: none !important;
-  box-shadow: none !important
+  box-shadow: none !important;
 }
-
-.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+2) .flatpickr-day.inRange:nth-child(7n+1) {
+.flatpickr-calendar.multiMonth
+  .flatpickr-days
+  .dayContainer:nth-child(n + 2)
+  .flatpickr-day.inRange:nth-child(7n + 1) {
   -webkit-box-shadow: -2px 0 0 $medium-gray, 5px 0 0 $medium-gray;
-  box-shadow: -2px 0 0 $medium-gray, 5px 0 0 $medium-gray
+  box-shadow: -2px 0 0 $medium-gray, 5px 0 0 $medium-gray;
 }
-
 .flatpickr-calendar .hasWeeks .dayContainer,
 .flatpickr-calendar .hasTime .dayContainer {
   border-bottom: 0;
   border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0
+  border-bottom-left-radius: 0;
 }
-
 .flatpickr-calendar .hasWeeks .dayContainer {
-  border-left: 0
+  border-left: 0;
 }
-
-.flatpickr-calendar.showTimeInput.hasTime .flatpickr-time {
+.flatpickr-calendar.hasTime .flatpickr-time {
   height: 40px;
-  border-top: 1px solid $medium-gray
+  border-top: 1px solid $medium-gray;
 }
-
 .flatpickr-calendar.noCalendar.hasTime .flatpickr-time {
-  height: auto
+  height: auto;
 }
-
 .flatpickr-calendar:before,
 .flatpickr-calendar:after {
   position: absolute;
   display: block;
   pointer-events: none;
   border: solid transparent;
-  content: '';
+  content: "";
   height: 0;
   width: 0;
-  left: 22px
+  left: 22px;
 }
-
 .flatpickr-calendar.rightMost:before,
-.flatpickr-calendar.rightMost:after {
+.flatpickr-calendar.arrowRight:before,
+.flatpickr-calendar.rightMost:after,
+.flatpickr-calendar.arrowRight:after {
   left: auto;
-  right: 22px
+  right: 22px;
+}
+.flatpickr-calendar.arrowCenter:before,
+.flatpickr-calendar.arrowCenter:after {
+  left: 50%;
+  right: 50%;
 }
-
 .flatpickr-calendar:before {
   border-width: 5px;
-  margin: 0 -5px
+  margin: 0 -5px;
 }
-
 .flatpickr-calendar:after {
   border-width: 4px;
-  margin: 0 -4px
+  margin: 0 -4px;
 }
-
 .flatpickr-calendar.arrowTop:before,
 .flatpickr-calendar.arrowTop:after {
-  bottom: 100%
+  bottom: 100%;
 }
-
 .flatpickr-calendar.arrowTop:before {
-  border-bottom-color: $medium-gray
+  border-bottom-color: $medium-gray;
 }
-
 .flatpickr-calendar.arrowTop:after {
-  border-bottom-color: $white
+  border-bottom-color: $white;
 }
-
 .flatpickr-calendar.arrowBottom:before,
 .flatpickr-calendar.arrowBottom:after {
-  top: 100%
+  top: 100%;
 }
-
 .flatpickr-calendar.arrowBottom:before {
-  border-top-color: $medium-gray
+  border-top-color: $medium-gray;
 }
-
 .flatpickr-calendar.arrowBottom:after {
-  border-top-color: $white
+  border-top-color: $white;
 }
-
 .flatpickr-calendar:focus {
-  outline: 0
+  outline: 0;
 }
-
 .flatpickr-wrapper {
   position: relative;
-  display: inline-block
+  display: inline-block;
 }
-
 .flatpickr-months {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
 }
-
 .flatpickr-months .flatpickr-month {
   background: transparent;
   color: rgba(0, 0, 0, 0.9);
   fill: rgba(0, 0, 0, 0.9);
-  height: $form-field-height;
+  height: 34px;
   line-height: 1;
   text-align: center;
   position: relative;
@@ -172,43 +161,35 @@
   -webkit-box-flex: 1;
   -webkit-flex: 1;
   -ms-flex: 1;
-  flex: 1
+  flex: 1;
 }
-
 .flatpickr-months .flatpickr-prev-month,
 .flatpickr-months .flatpickr-next-month {
   text-decoration: none;
   cursor: pointer;
   position: absolute;
   top: 0;
-  line-height: 16px;
-  height: 28px;
+  height: 34px;
   padding: 10px;
   z-index: 3;
   color: rgba(0, 0, 0, 0.9);
   fill: rgba(0, 0, 0, 0.9);
 }
-
-.flatpickr-months .flatpickr-prev-month.disabled,
-.flatpickr-months .flatpickr-next-month.disabled {
-  display: none
+.flatpickr-months .flatpickr-prev-month.flatpickr-disabled,
+.flatpickr-months .flatpickr-next-month.flatpickr-disabled {
+  display: none;
 }
-
 .flatpickr-months .flatpickr-prev-month i,
 .flatpickr-months .flatpickr-next-month i {
-  position: relative
+  position: relative;
 }
-
 .flatpickr-months .flatpickr-prev-month.flatpickr-prev-month,
 .flatpickr-months .flatpickr-next-month.flatpickr-prev-month {
   /*
       /*rtl:begin:ignore*/
-  left: 0;
-  /*
+  left: 0; /*
       /*rtl:end:ignore*/
-}
-
-/*
+} /*
       /*rtl:begin:ignore*/
 /*
       /*rtl:end:ignore*/
@@ -216,12 +197,9 @@
 .flatpickr-months .flatpickr-next-month.flatpickr-next-month {
   /*
       /*rtl:begin:ignore*/
-  right: 0;
-  /*
+  right: 0; /*
       /*rtl:end:ignore*/
-}
-
-/*
+} /*
       /*rtl:begin:ignore*/
 /*
       /*rtl:end:ignore*/
@@ -229,43 +207,40 @@
 .flatpickr-months .flatpickr-next-month:hover {
   color: $dark-gray;
 }
-
 .flatpickr-months .flatpickr-prev-month:hover svg,
 .flatpickr-months .flatpickr-next-month:hover svg {
   fill: $dark-orange;
 }
-
 .flatpickr-months .flatpickr-prev-month svg,
 .flatpickr-months .flatpickr-next-month svg {
   width: 14px;
   height: 14px;
 }
-
 .flatpickr-months .flatpickr-prev-month svg path,
 .flatpickr-months .flatpickr-next-month svg path {
-  -webkit-transition: fill .1s;
-  transition: fill .1s;
-  fill: inherit
+  -webkit-transition: fill 0.1s;
+  transition: fill 0.1s;
+  fill: inherit;
 }
-
 .numInputWrapper {
   position: relative;
   height: auto;
 }
-
 .numInputWrapper input,
 .numInputWrapper span {
-  display: inline-block
+  display: inline-block;
 }
-
 .numInputWrapper input {
   width: 100%;
 }
-
 .numInputWrapper input::-ms-clear {
-  display: none
+  display: none;
+}
+.numInputWrapper input::-webkit-outer-spin-button,
+.numInputWrapper input::-webkit-inner-spin-button {
+  margin: 0;
+  -webkit-appearance: none;
 }
-
 .numInputWrapper span {
   position: absolute;
   right: 0;
@@ -275,119 +250,101 @@
   line-height: 50%;
   opacity: 0;
   cursor: pointer;
-  border: 1px solid rgba(57, 57, 57, 0.15);
+  border: $default-border;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
 }
-
 .numInputWrapper span:hover {
-  background: rgba(0, 0, 0, 0.1)
+  background: rgba(0, 0, 0, 0.1);
 }
-
 .numInputWrapper span:active {
-  background: rgba(0, 0, 0, 0.2)
+  background: rgba(0, 0, 0, 0.2);
 }
-
 .numInputWrapper span:after {
   display: block;
   content: "";
-  position: absolute
+  position: absolute;
 }
-
 .numInputWrapper span.arrowUp {
   top: 0;
   border-bottom: 0;
 }
-
 .numInputWrapper span.arrowUp:after {
   border-left: 4px solid transparent;
   border-right: 4px solid transparent;
-  border-bottom: 4px solid rgba(57, 57, 57, 0.6);
-  top: 26%
+  border-bottom: 4px solid $default-border-color;
+  top: 26%;
 }
-
 .numInputWrapper span.arrowDown {
   top: 50%;
 }
-
 .numInputWrapper span.arrowDown:after {
   border-left: 4px solid transparent;
   border-right: 4px solid transparent;
-  border-top: 4px solid rgba(57, 57, 57, 0.6);
-  top: 40%
+  border-top: 4px solid $default-border-color;
+  top: 40%;
 }
-
 .numInputWrapper span svg {
   width: inherit;
   height: auto;
 }
-
 .numInputWrapper span svg path {
-  fill: rgba(0, 0, 0, 0.5)
+  fill: rgba(0, 0, 0, 0.5);
 }
-
 .numInputWrapper:hover {
   background: rgba(0, 0, 0, 0.05);
 }
-
 .numInputWrapper:hover span {
-  opacity: 1
+  opacity: 1;
 }
-
 .flatpickr-current-month {
-  font-size: 1.25rem;
+  font-size: 135%;
   line-height: inherit;
   font-weight: 300;
   color: inherit;
   position: absolute;
   width: 75%;
   left: 12.5%;
-  padding: 6.16px 0 0 0;
+  padding: 7.48px 0 0 0;
   line-height: 1;
-  height: 28px;
+  height: 34px;
   display: inline-block;
   text-align: center;
   -webkit-transform: translate3d(0, 0, 0);
   transform: translate3d(0, 0, 0);
 }
-
 .flatpickr-current-month span.cur-month {
   font-family: inherit;
   font-weight: 700;
   color: inherit;
   display: inline-block;
-  margin-left: .5ch;
+  margin-left: 0.5ch;
   padding: 0;
 }
-
 .flatpickr-current-month span.cur-month:hover {
-  background: rgba(0, 0, 0, 0.05)
+  background: rgba(0, 0, 0, 0.05);
 }
-
 .flatpickr-current-month .numInputWrapper {
   width: 6ch;
   width: 7ch\0;
   display: inline-block;
 }
-
 .flatpickr-current-month .numInputWrapper span.arrowUp:after {
-  border-bottom-color: rgba(0, 0, 0, 0.9)
+  border-bottom-color: rgba(0, 0, 0, 0.9);
 }
-
 .flatpickr-current-month .numInputWrapper span.arrowDown:after {
-  border-top-color: rgba(0, 0, 0, 0.9)
+  border-top-color: rgba(0, 0, 0, 0.9);
 }
-
 .flatpickr-current-month input.cur-year {
   background: transparent;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   color: inherit;
   cursor: text;
-  padding: 0 0 0 .5ch;
+  padding: 0 0 0 0.5ch;
   margin: 0;
   display: inline-block;
-  font-size: $form-field-font-size;
+  font-size: inherit;
   font-family: inherit;
   font-weight: 300;
   line-height: inherit;
@@ -395,19 +352,57 @@
   border: 0;
   border-radius: 0;
   vertical-align: initial;
+  -webkit-appearance: textfield;
+  -moz-appearance: textfield;
+  appearance: textfield;
 }
-
 .flatpickr-current-month input.cur-year:focus {
-  outline: 0
+  outline: 0;
 }
-
 .flatpickr-current-month input.cur-year[disabled],
 .flatpickr-current-month input.cur-year[disabled]:hover {
+  font-size: 100%;
   color: rgba(0, 0, 0, 0.5);
   background: transparent;
-  pointer-events: none
+  pointer-events: none;
+}
+.flatpickr-current-month .flatpickr-monthDropdown-months {
+  appearance: menulist;
+  background: transparent;
+  border: none;
+  border-radius: 0;
+  box-sizing: border-box;
+  color: inherit;
+  cursor: pointer;
+  font-size: inherit;
+  font-family: inherit;
+  font-weight: 300;
+  height: auto;
+  line-height: inherit;
+  margin: -1px 0 0 0;
+  outline: none;
+  padding: 0 0 0 0.5ch;
+  position: relative;
+  vertical-align: initial;
+  -webkit-box-sizing: border-box;
+  -webkit-appearance: menulist;
+  -moz-appearance: menulist;
+  width: auto;
+}
+.flatpickr-current-month .flatpickr-monthDropdown-months:focus,
+.flatpickr-current-month .flatpickr-monthDropdown-months:active {
+  outline: none;
+}
+.flatpickr-current-month .flatpickr-monthDropdown-months:hover {
+  background: rgba(0, 0, 0, 0.05);
+}
+.flatpickr-current-month
+  .flatpickr-monthDropdown-months
+  .flatpickr-monthDropdown-month {
+  background-color: transparent;
+  outline: none;
+  padding: 0;
 }
-
 .flatpickr-weekdays {
   background: transparent;
   text-align: center;
@@ -423,7 +418,6 @@
   align-items: center;
   height: 28px;
 }
-
 .flatpickr-weekdays .flatpickr-weekdaycontainer {
   display: -webkit-box;
   display: -webkit-flex;
@@ -432,11 +426,11 @@
   -webkit-box-flex: 1;
   -webkit-flex: 1;
   -ms-flex: 1;
-  flex: 1
+  flex: 1;
 }
-
 span.flatpickr-weekday {
   cursor: default;
+  font-size: 90%;
   background: transparent;
   color: rgba(0, 0, 0, 0.54);
   line-height: 1;
@@ -447,14 +441,12 @@ span.flatpickr-weekday {
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
-  font-weight: bolder
+  font-weight: bolder;
 }
-
 .dayContainer,
 .flatpickr-weeks {
-  padding: 1px 0 0 0
+  padding: 1px 0 0 0;
 }
-
 .flatpickr-days {
   position: relative;
   overflow: hidden;
@@ -468,11 +460,9 @@ span.flatpickr-weekday {
   align-items: flex-start;
   width: 307.875px;
 }
-
 .flatpickr-days:focus {
-  outline: 0
+  outline: 0;
 }
-
 .dayContainer {
   padding: 0;
   outline: 0;
@@ -497,16 +487,14 @@ span.flatpickr-weekday {
   transform: translate3d(0, 0, 0);
   opacity: 1;
 }
-
-.dayContainer+.dayContainer {
+.dayContainer + .dayContainer {
   -webkit-box-shadow: -1px 0 0 $medium-gray;
-  box-shadow: -1px 0 0 $medium-gray
+  box-shadow: -1px 0 0 $medium-gray;
 }
-
 .flatpickr-day {
   background: none;
   border: 1px solid transparent;
-  border-radius: $default-border-radius;
+  border-radius: 150px;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   color: #393939;
@@ -528,7 +516,6 @@ span.flatpickr-weekday {
   justify-content: center;
   text-align: center;
 }
-
 .flatpickr-day.inRange,
 .flatpickr-day.prevMonthDay.inRange,
 .flatpickr-day.nextMonthDay.inRange,
@@ -544,20 +531,17 @@ span.flatpickr-weekday {
   cursor: pointer;
   outline: 0;
   background: $medium-gray;
-  border-color: $medium-gray
+  border-color: $medium-gray;
 }
-
 .flatpickr-day.today {
   border-color: $dark-gray;
 }
-
 .flatpickr-day.today:hover,
 .flatpickr-day.today:focus {
   border-color: $dark-gray;
   background: $dark-gray;
-  color: $white
+  color: $white;
 }
-
 .flatpickr-day.selected,
 .flatpickr-day.startRange,
 .flatpickr-day.endRange,
@@ -580,42 +564,36 @@ span.flatpickr-weekday {
   -webkit-box-shadow: none;
   box-shadow: none;
   color: $white;
-  border-color: $blue
+  border-color: $blue;
 }
-
 .flatpickr-day.selected.startRange,
 .flatpickr-day.startRange.startRange,
 .flatpickr-day.endRange.startRange {
-  border-radius: 50px 0 0 50px
+  border-radius: 50px 0 0 50px;
 }
-
 .flatpickr-day.selected.endRange,
 .flatpickr-day.startRange.endRange,
 .flatpickr-day.endRange.endRange {
-  border-radius: 0 50px 50px 0
+  border-radius: 0 50px 50px 0;
 }
-
-.flatpickr-day.selected.startRange+.endRange:not(:nth-child(7n+1)),
-.flatpickr-day.startRange.startRange+.endRange:not(:nth-child(7n+1)),
-.flatpickr-day.endRange.startRange+.endRange:not(:nth-child(7n+1)) {
+.flatpickr-day.selected.startRange + .endRange:not(:nth-child(7n + 1)),
+.flatpickr-day.startRange.startRange + .endRange:not(:nth-child(7n + 1)),
+.flatpickr-day.endRange.startRange + .endRange:not(:nth-child(7n + 1)) {
   -webkit-box-shadow: -10px 0 0 $blue;
-  box-shadow: -10px 0 0 $blue
+  box-shadow: -10px 0 0 $blue;
 }
-
 .flatpickr-day.selected.startRange.endRange,
 .flatpickr-day.startRange.startRange.endRange,
 .flatpickr-day.endRange.startRange.endRange {
-  border-radius: 50px
+  border-radius: 50px;
 }
-
 .flatpickr-day.inRange {
   border-radius: 0;
   -webkit-box-shadow: -5px 0 0 $medium-gray, 5px 0 0 $medium-gray;
-  box-shadow: -5px 0 0 $medium-gray, 5px 0 0 $medium-gray
+  box-shadow: -5px 0 0 $medium-gray, 5px 0 0 $medium-gray;
 }
-
-.flatpickr-day.disabled,
-.flatpickr-day.disabled:hover,
+.flatpickr-day.flatpickr-disabled,
+.flatpickr-day.flatpickr-disabled:hover,
 .flatpickr-day.prevMonthDay,
 .flatpickr-day.nextMonthDay,
 .flatpickr-day.notAllowed,
@@ -624,46 +602,37 @@ span.flatpickr-weekday {
   color: rgba(57, 57, 57, 0.3);
   background: transparent;
   border-color: transparent;
-  cursor: default
+  cursor: default;
 }
-
-.flatpickr-day.disabled,
-.flatpickr-day.disabled:hover {
+.flatpickr-day.flatpickr-disabled,
+.flatpickr-day.flatpickr-disabled:hover {
   cursor: not-allowed;
-  color: rgba(57, 57, 57, 0.1)
+  color: rgba(57, 57, 57, 0.1);
 }
-
 .flatpickr-day.week.selected {
   border-radius: 0;
   -webkit-box-shadow: -5px 0 0 $blue, 5px 0 0 $blue;
-  box-shadow: -5px 0 0 $blue, 5px 0 0 $blue
+  box-shadow: -5px 0 0 $blue, 5px 0 0 $blue;
 }
-
 .flatpickr-day.hidden {
-  visibility: hidden
+  visibility: hidden;
 }
-
 .rangeMode .flatpickr-day {
-  margin-top: 1px
+  margin-top: 1px;
 }
-
 .flatpickr-weekwrapper {
-  display: inline-block;
   float: left;
 }
-
 .flatpickr-weekwrapper .flatpickr-weeks {
   padding: 0 12px;
   -webkit-box-shadow: 1px 0 0 $medium-gray;
-  box-shadow: 1px 0 0 $medium-gray
+  box-shadow: 1px 0 0 $medium-gray;
 }
-
 .flatpickr-weekwrapper .flatpickr-weekday {
   float: none;
   width: 100%;
-  line-height: 28px
+  line-height: 28px;
 }
-
 .flatpickr-weekwrapper span.flatpickr-day,
 .flatpickr-weekwrapper span.flatpickr-day:hover {
   display: block;
@@ -672,9 +641,8 @@ span.flatpickr-weekday {
   color: rgba(57, 57, 57, 0.3);
   background: transparent;
   cursor: default;
-  border: none
+  border: none;
 }
-
 .flatpickr-innerContainer {
   display: block;
   display: -webkit-box;
@@ -685,14 +653,12 @@ span.flatpickr-weekday {
   box-sizing: border-box;
   overflow: hidden;
 }
-
 .flatpickr-rContainer {
   display: inline-block;
   padding: 0;
   -webkit-box-sizing: border-box;
-  box-sizing: border-box
+  box-sizing: border-box;
 }
-
 .flatpickr-time {
   text-align: center;
   outline: 0;
@@ -708,13 +674,11 @@ span.flatpickr-weekday {
   display: -ms-flexbox;
   display: flex;
 }
-
 .flatpickr-time:after {
   content: "";
   display: table;
-  clear: both
+  clear: both;
 }
-
 .flatpickr-time .numInputWrapper {
   -webkit-box-flex: 1;
   -webkit-flex: 1;
@@ -724,23 +688,18 @@ span.flatpickr-weekday {
   height: 40px;
   float: left;
 }
-
 .flatpickr-time .numInputWrapper span.arrowUp:after {
-  border-bottom-color: #393939
+  border-bottom-color: #393939;
 }
-
 .flatpickr-time .numInputWrapper span.arrowDown:after {
-  border-top-color: #393939
+  border-top-color: #393939;
 }
-
 .flatpickr-time.hasSeconds .numInputWrapper {
-  width: 26%
+  width: 26%;
 }
-
 .flatpickr-time.time24hr .numInputWrapper {
-  width: 49%
+  width: 49%;
 }
-
 .flatpickr-time input {
   background: transparent;
   -webkit-box-shadow: none;
@@ -752,31 +711,29 @@ span.flatpickr-weekday {
   padding: 0;
   height: inherit;
   line-height: inherit;
-  color: #393939;
-  font-size: $form-field-font-size;
+  color: $form-field-text-color;
+  font-size: 14px;
   position: relative;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
+  -webkit-appearance: textfield;
+  -moz-appearance: textfield;
+  appearance: textfield;
 }
-
 .flatpickr-time input.flatpickr-hour {
-  font-weight: bold
+  font-weight: bold;
 }
-
 .flatpickr-time input.flatpickr-minute,
 .flatpickr-time input.flatpickr-second {
-  font-weight: 400
+  font-weight: 400;
 }
-
 .flatpickr-time input:focus {
   outline: 0;
-  border: 0
+  border: 0;
 }
-
 .flatpickr-time .flatpickr-time-separator,
 .flatpickr-time .flatpickr-am-pm {
   height: inherit;
-  display: inline-block;
   float: left;
   line-height: inherit;
   color: #393939;
@@ -788,52 +745,45 @@ span.flatpickr-weekday {
   user-select: none;
   -webkit-align-self: center;
   -ms-flex-item-align: center;
-  align-self: center
+  align-self: center;
 }
-
 .flatpickr-time .flatpickr-am-pm {
   outline: 0;
   width: 18%;
   cursor: pointer;
   text-align: center;
-  font-weight: 400
+  font-weight: 400;
 }
-
 .flatpickr-time input:hover,
 .flatpickr-time .flatpickr-am-pm:hover,
 .flatpickr-time input:focus,
 .flatpickr-time .flatpickr-am-pm:focus {
-  background: $light-gray
+  background: $light-gray;
 }
-
 .flatpickr-input[readonly] {
-  cursor: pointer
+  cursor: pointer;
 }
-
 @-webkit-keyframes fpFadeInDown {
   from {
     opacity: 0;
     -webkit-transform: translate3d(0, -20px, 0);
-    transform: translate3d(0, -20px, 0)
+    transform: translate3d(0, -20px, 0);
   }
-
   to {
     opacity: 1;
     -webkit-transform: translate3d(0, 0, 0);
-    transform: translate3d(0, 0, 0)
+    transform: translate3d(0, 0, 0);
   }
 }
-
 @keyframes fpFadeInDown {
   from {
     opacity: 0;
     -webkit-transform: translate3d(0, -20px, 0);
-    transform: translate3d(0, -20px, 0)
+    transform: translate3d(0, -20px, 0);
   }
-
   to {
     opacity: 1;
     -webkit-transform: translate3d(0, 0, 0);
-    transform: translate3d(0, 0, 0)
+    transform: translate3d(0, 0, 0);
   }
 }

data/app/controllers/alchemy/admin/base_controller.rb

@@ -40,9 +40,7 @@ module Alchemy
       def exception_handler(error)
         exception_logger(error)
         show_error_notice(error)
-        if defined?(Airbrake)
-          notify_airbrake(error) unless Rails.env.development? || Rails.env.test?
-        end
+        notify_error_tracker(error)
       end
 
       # Displays an error notice in the Alchemy backend.
@@ -146,6 +144,14 @@ module Alchemy
             site
           end
       end
+
+      def notify_error_tracker(exception)
+        if ::Alchemy::ErrorTracking.notification_handler.respond_to?(:call)
+          ::Alchemy::ErrorTracking.notification_handler.call(exception)
+        else
+          Rails.logger.warn("To use the Alchemy::ErrorTracking.notification_handler, it must respond to #call.")
+        end
+      end
     end
   end
 end

data/lib/alchemy/engine.rb

@@ -44,5 +44,12 @@ module Alchemy
         end
       end
     end
+
+    initializer "alchemy.error_tracking" do
+      if defined?(Airbrake)
+        require_relative "error_tracking/airbrake_handler"
+        Alchemy::ErrorTracking.notification_handler = Alchemy::ErrorTracking::AirbrakeHandler
+      end
+    end
   end
 end

data/lib/alchemy/error_tracking/airbrake_handler.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module ErrorTracking
+    class AirbrakeHandler < BaseHandler
+      def self.call(exception)
+        return if ["development", "test"].include?(Rails.env)
+
+        notify_airbrake(exception)
+      end
+    end
+  end
+end

data/lib/alchemy/error_tracking.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module ErrorTracking
+    class BaseHandler
+      def self.call(exception)
+        # implement your own notification method
+      end
+    end
+
+    mattr_accessor :notification_handler
+    @@notification_handler = BaseHandler
+  end
+end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.0-rc3"
+  VERSION = "6.0.0-rc4"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -37,6 +37,7 @@ require_relative "alchemy/controller_actions"
 require_relative "alchemy/deprecation"
 require_relative "alchemy/element_definition"
 require_relative "alchemy/elements_finder"
+require_relative "alchemy/error_tracking"
 require_relative "alchemy/errors"
 require_relative "alchemy/essence"
 require_relative "alchemy/filetypes"

data/package/admin.js

@@ -5,6 +5,7 @@ import fileEditors from "./src/file_editors"
 import pictureEditors from "./src/picture_editors"
 import ImageLoader from "./src/image_loader"
 import ImageCropper from "./src/image_cropper"
+import Datepicker from "./src/datepicker"
 
 // Global Alchemy object
 if (typeof window.Alchemy === "undefined") {
@@ -20,5 +21,6 @@ Object.assign(Alchemy, {
   fileEditors,
   pictureEditors,
   ImageLoader: ImageLoader.init,
-  ImageCropper
+  ImageCropper,
+  Datepicker
 })

data/package/src/datepicker.js

@@ -0,0 +1,39 @@
+import flatpickr from "flatpickr"
+
+export default function Datepicker(scope = document) {
+  if (scope === "") {
+    scope = document
+  } else if (scope instanceof String) {
+    scope = document.querySelectorAll(scope)
+  }
+
+  const datepickerInputs = scope.querySelectorAll("input[data-datepicker-type]")
+
+  // Initializes the datepickers on the text inputs and sets the proper type
+  // to enable browsers default datepicker if the current OS is iOS.
+  if (Alchemy.isiOS) {
+    datepickerInputs.forEach((input) => {
+      input.attributes.type = input.dataset.datepickerType
+    })
+  } else {
+    datepickerInputs.forEach((input) => {
+      const type = input.dataset.datepickerType
+      const options = {
+        // alchemy_i18n supports `zh_CN` etc., but flatpickr only has two-letter codes (`zh`)
+        locale: Alchemy.locale.slice(0, 2),
+        altInput: true,
+        altFormat: Alchemy.t(`formats.${type}`),
+        altInputClass: "flatpickr-input",
+        enableTime: /time/.test(type),
+        noCalendar: type === "time",
+        time_24hr: Alchemy.t("formats.time_24hr"),
+        onValueUpdate(_selectedDates, _dateStr, instance) {
+          return Alchemy.setElementDirty(
+            instance.element.closest(".element-editor")
+          )
+        }
+      }
+      flatpickr(input, options)
+    })
+  }
+}

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.0-rc3",
+  "version": "6.0.0-rc4",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [
@@ -24,6 +24,7 @@
   },
   "homepage": "https://github.com/AlchemyCMS/alchemy_cms#readme",
   "dependencies": {
+    "flatpickr": "^4.6.9",
     "lodash-es": "^4.17.21",
     "sortablejs": "^1.10.2"
   },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.rc3
+  version: 6.0.0.pre.rc4
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2022-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -408,9 +408,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -418,9 +418,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -757,7 +757,6 @@ files:
 - app/assets/javascripts/alchemy/alchemy.buttons.js.coffee
 - app/assets/javascripts/alchemy/alchemy.char_counter.js.coffee
 - app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee
-- app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee
 - app/assets/javascripts/alchemy/alchemy.dialog.js.coffee
 - app/assets/javascripts/alchemy/alchemy.dirty.js.coffee
 - app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee
@@ -1308,6 +1307,8 @@ files:
 - lib/alchemy/element_definition.rb
 - lib/alchemy/elements_finder.rb
 - lib/alchemy/engine.rb
+- lib/alchemy/error_tracking.rb
+- lib/alchemy/error_tracking/airbrake_handler.rb
 - lib/alchemy/errors.rb
 - lib/alchemy/essence.rb
 - lib/alchemy/filetypes.rb
@@ -1424,6 +1425,7 @@ files:
 - package.json
 - package/admin.js
 - package/src/__tests__/i18n.spec.js
+- package/src/datepicker.js
 - package/src/file_editors.js
 - package/src/i18n.js
 - package/src/image_cropper.js

data/app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee

@@ -1,29 +0,0 @@
-window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
-
-$.extend Alchemy,
-
-  Datepicker: (scope) ->
-    $datepicker_inputs = $('input[data-datepicker-type]', scope)
-
-    # Initializes the datepickers on the text inputs and sets the proper type
-    # to enable browsers default datepicker if the current OS is iOS.
-    if Alchemy.isiOS
-      $datepicker_inputs.prop "type", ->
-        return $(this).data('datepicker-type')
-    else
-      $datepicker_inputs.each ->
-        type = $(this).data('datepicker-type')
-        options =
-          # alchemy_i18n supports `zh_CN` etc., but flatpickr only has two-letter codes (`zh`)
-          locale: Alchemy.locale.slice(0, 2)
-          altInput: true
-          altFormat: Alchemy.t("formats.#{type}")
-          altInputClass: ""
-          enableTime: /time/.test(type)
-          noCalendar: type == "time"
-          time_24hr: Alchemy.t("formats.time_24hr")
-          onValueUpdate: (_selectedDates, _dateStr, instance) ->
-            Alchemy.setElementDirty $(instance.element).closest(".element-editor")
-        $(this).flatpickr(options)
-
-    return