Adam Shaw 7 лет назад
Родитель
Сommit
eed49bdf4e
3 измененных файлов с 11 добавлено и 10 удалено
  1. 4 3
      src/Calendar.ts
  2. 4 4
      src/formatting-api.ts
  3. 3 3
      tests/automated/legacy/current-date.js

+ 4 - 3
src/Calendar.ts

@@ -819,13 +819,14 @@ export default class Calendar {
   }
 
 
-  formatRange(d0: Date, d1: Date, formatter, isEndExclusive?: boolean) {
+  // `settings` is for formatter AND isEndExclusive
+  formatRange(d0: Date, d1: Date, settings) {
     const { dateEnv } = this
     return dateEnv.formatRange(
       dateEnv.createMarker(d0),
       dateEnv.createMarker(d1),
-      createFormatter(formatter, this.opt('defaultRangeSeparator')),
-      { isEndExclusive }
+      createFormatter(settings, this.opt('defaultRangeSeparator')),
+      settings
     )
   }
 

+ 4 - 4
src/formatting-api.ts

@@ -21,11 +21,10 @@ export function formatDate(dateInput: DateInput, settings = {}) {
 export function formatRange(
   startInput: DateInput,
   endInput: DateInput,
-  settings, // mixture of env and formatter settings
-  defaultSeparator: string = globalDefaults.defaultRangeSeparator
+  settings // mixture of env and formatter settings
 ) {
   let dateEnv = buildDateEnv(typeof settings === 'object' && settings ? settings : {}) // pass in if non-null object
-  let formatter = createFormatter(settings, defaultSeparator)
+  let formatter = createFormatter(settings, globalDefaults.defaultRangeSeparator)
   let startMeta = dateEnv.createMarkerMeta(startInput)
   let endMeta = dateEnv.createMarkerMeta(endInput)
 
@@ -35,7 +34,8 @@ export function formatRange(
 
   return dateEnv.formatRange(startMeta.marker, endMeta.marker, formatter, {
     forcedStartTzo: startMeta.forcedTzo,
-    forcedEndTzo: endMeta.forcedTzo
+    forcedEndTzo: endMeta.forcedTzo,
+    isEndExclusive: settings.isEndExclusive
   })
 }
 

+ 3 - 3
tests/automated/legacy/current-date.js

@@ -3,7 +3,8 @@ describe('current date', function() {
     month: 'long',
     day: 'numeric',
     year: 'numeric',
-    separator: ' - '
+    separator: ' - ',
+    isEndExclusive: true
   }
 
   pushOptions({
@@ -278,8 +279,7 @@ describe('current date', function() {
       title = currentCalendar.formatRange(
         titleStart,
         titleEnd,
-        TITLE_FORMAT,
-        true // isEndExclusive
+        TITLE_FORMAT
       )
     } else {
       title = currentCalendar.formatDate(titleStart, TITLE_FORMAT)