Merge pull request #390 from spencermountain/dev

Dev

builds/spacetime.cjs

@@ -3087,15 +3087,15 @@
     dayTime: function (str, goFwd) {
       if (str !== undefined) {
         const times = {
-          morning: '7:00am',
-          breakfast: '7:00am',
-          noon: '12:00am',
-          lunch: '12:00pm',
-          afternoon: '2:00pm',
-          evening: '6:00pm',
-          dinner: '6:00pm',
-          night: '11:00pm',
-          midnight: '23:59pm'
+          morning: '7:00',
+          breakfast: '7:00',
+          noon: '12:00',
+          lunch: '12:00',
+          afternoon: '14:00',
+          evening: '18:00',
+          dinner: '18:00',
+          night: '23:00',
+          midnight: '00:00'
         };
         let s = this.clone();
         str = str || '';

scratch.js

@@ -1,12 +1,11 @@
 // const spacetime = require('./builds/spacetime.cjs')
 import spacetime from './src/index.js'
 
-// spacetime.extend(require('./plugins/holiday'))
-
-// let s = spacetime()
+let s = spacetime()
 // s = s.year(2020)
 // s = s.dayOfYear(366);
-// console.log(s.json())
+// console.log(s.dayTime());
+console.log(s.json())
 
 let s = spacetime('03/31/2002', 'America/Denver')
-console.log(s.iso())
+console.log(s.iso())

src/methods/query/01-time.js

@@ -126,15 +126,15 @@ const methods = {
   dayTime: function (str, goFwd) {
     if (str !== undefined) {
       const times = {
-        morning: '7:00am',
-        breakfast: '7:00am',
-        noon: '12:00am',
-        lunch: '12:00pm',
-        afternoon: '2:00pm',
-        evening: '6:00pm',
-        dinner: '6:00pm',
-        night: '11:00pm',
-        midnight: '23:59pm'
+        morning: '7:00',
+        breakfast: '7:00',
+        noon: '12:00',
+        lunch: '12:00',
+        afternoon: '14:00',
+        evening: '18:00',
+        dinner: '18:00',
+        night: '23:00',
+        midnight: '00:00'
       }
       let s = this.clone()
       str = str || ''