fix: logic for Before Start condition

chrisburnell · Apr 12, 2024 · dd5f427 · dd5f427
1 parent 1636070
commit dd5f427
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/event-countdown.js b/event-countdown.js
@@ -146,15 +146,13 @@ class EventCountdown extends HTMLElement {
 		if (this.start && this.end && this.start.getTime() < nowEpoch && nowEpoch < this.end.getTime()) {
 			// Between start and end
 			return `${this.name}${this.startPast}<time datetime="${this.start.toISOString()}" title="${this.start.toLocaleString()}">${this.getRelativeTime(this.start, this.division)}</time>${(this.conjunction + this.endFuture).replace(/ +/g, " ")}<time datetime="${this.end.toISOString()}" title="${this.end.toLocaleString()}">${this.getRelativeTime(this.end, this.division)}</time>.`
+		} else if (this.start && nowEpoch < this.start.getTime()) {
+			// Before start
+			return `${this.name}${this.startFuture}<time datetime="${this.start.toISOString()}" title="${this.start.toLocaleString()}">${this.getRelativeTime(this.start, this.division)}</time>.`
 		} else if (this.start && !this.end) {
-			if (nowEpoch < this.start.getTime()) {
-				// Before start
-				return `${this.name}${this.startFuture}<time datetime="${this.start.toISOString()}" title="${this.start.toLocaleString()}">${this.getRelativeTime(this.start, this.division)}</time>.`
-			}
 			// After start
 			return `${this.name}${this.startPast}<time datetime="${this.start.toISOString()}" title="${this.start.toLocaleString()}">${this.getRelativeTime(this.start, this.division)}</time>.`
-		}
-		if (nowEpoch < this.end.getTime()) {
+		} else if (nowEpoch < this.end.getTime()) {
 			// Before end
 			return `${this.name}${this.endFuture}<time datetime="${this.end.toISOString()}" title="${this.end.toLocaleString()}">${this.getRelativeTime(this.end, this.division)}</time>.`
 		}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chrisburnell/event-countdown",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "A Web Component to display an event countdown.",
   "author": "Chris Burnell <me@chrisburnell.com>",
   "contributors": [