airDatepicker: umpdated disabledDates js method

dreamRs · Aug 28, 2024 · 1eb5e3f · 1eb5e3f
1 parent ca76456
commit 1eb5e3f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/inst/packer/air-datepicker.js b/inst/packer/air-datepicker.js
diff --git a/srcjs/inputs/air-datepicker.js b/srcjs/inputs/air-datepicker.js
@@ -115,7 +115,7 @@ function onRenderCell(disabledDates, disabledDaysOfWeek, highlightedDates) {
       return {
         html: html,
         classes: classes,
-        disabled: disabled
+        disabled: disabled > 0
       };
     }
   };
@@ -157,9 +157,7 @@ $.extend(AirDatepickerBindings, {
 
     // disable dates
     var disabledDates = [];
-    if (config.hasOwnProperty("disabledDates")) {
-      disabledDates = config.disabledDates;
-    }
+
     var disabledDaysOfWeek = [];
     if (config.hasOwnProperty("disabledDaysOfWeek")) {
       disabledDaysOfWeek = config.disabledDaysOfWeek;
@@ -186,6 +184,9 @@ $.extend(AirDatepickerBindings, {
     if (config.hasOwnProperty("startView")) {
       dp.date = as_date({date: config.startView, tz: options.tz});
     }
+    if (config.hasOwnProperty("disabledDates")) {
+      dp.disableDate(config.disabledDates);
+    }
     AirDatepickerBindings.updateStore(el, dp);
   },
   find: scope => {
@@ -263,14 +264,14 @@ $.extend(AirDatepickerBindings, {
       }
 
       if (
-        options.hasOwnProperty("disabledDates") |
         options.hasOwnProperty("disabledDaysOfWeek") |
         options.hasOwnProperty("highlightedDates")
       ) {
+        //dp.enableDate(dp.disabledDates);
         var disabledDates = [];
-        if (options.hasOwnProperty("disabledDates")) {
-          disabledDates = options.disabledDates;
-        }
+        //if (options.hasOwnProperty("disabledDates")) {
+        //  disabledDates = options.disabledDates;
+        //}
         var disabledDaysOfWeek = [];
         if (options.hasOwnProperty("disabledDaysOfWeek")) {
           disabledDaysOfWeek = options.disabledDaysOfWeek;
@@ -279,11 +280,21 @@ $.extend(AirDatepickerBindings, {
         if (options.hasOwnProperty("highlightedDates")) {
           highlightedDates = options.highlightedDates;
         }
+
         options.onRenderCell = onRenderCell(disabledDates, disabledDaysOfWeek, highlightedDates);
       }
 
       dp.update(options);
 
+      if (options.hasOwnProperty("disabledDates")) {
+        if (dp.disabledDates.size > 0) {
+          dp.disabledDates.forEach(function (value) {
+            dp.enableDate(value);
+          });
+        }
+        dp.disableDate(options.disabledDates);
+      }
+
       if (options.hasOwnProperty("startView")) {
         dp.date = as_date({date: options.startView, tz: options.tz});
       }