fix: remove single am/pm usage to always show both am/pm (#300)

chronotruck · Jun 20, 2020 · 688211a · 688211a
1 parent 458ff1b
commit 688211a
Showing 1 changed file with 3 additions and 14 deletions.
diff --git a/src/VueCtkDateTimePicker/_subs/PickersContainer/_subs/TimePicker.vue b/src/VueCtkDateTimePicker/_subs/PickersContainer/_subs/TimePicker.vue
@@ -145,21 +145,10 @@
         return ArrayMinuteRange(0, 60, twoDigit, this.minuteInterval, this._disabledMinutes)
       },
       apms () {
-        const ampm = this.isTwelveFormat
-          ? this.minTime
-            ? moment(this.minTime, 'hh:mm a').format('a')
-            : this.maxTime
-              ? moment(this.maxTime, 'hh:mm a').format('a')
-              : ''
-          : ''
-        const upper = ampm
-          ? [{ value: ampm.toUpperCase(), item: ampm.toUpperCase() }]
-          : [{ value: 'AM', item: 'AM' }, { value: 'PM', item: 'PM' }]
-        const lower = ampm
-          ? [{ value: ampm, item: ampm }]
-          : [{ value: 'am', item: 'am' }, { value: 'pm', item: 'pm' }]
         return this.isTwelveFormat
-          ? this.format.includes('A') ? upper : lower
+          ? this.format.includes('A')
+            ? [{ value: 'AM', item: 'AM' }, { value: 'PM', item: 'PM' }]
+            : [{ value: 'am', item: 'am' }, { value: 'pm', item: 'pm' }]
           : null
       },
       columns () {