From: Iskren Chernev <iskren.chernev@gmail.com>
Date: Sat, 16 Apr 2016 06:57:46 +0000 (-0700)
Subject: Refactored isBetween, related to #2991
X-Git-Tag: 2.13.0~20^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b4a7acf4be56b7fd5ab3a36ac637ae6baf3740b;p=thirdparty%2Fmoment.git

Refactored isBetween, related to #2991
---

diff --git a/src/lib/moment/compare.js b/src/lib/moment/compare.js
index f35a72e06..b26bac633 100644
--- a/src/lib/moment/compare.js
+++ b/src/lib/moment/compare.js
@@ -30,14 +30,9 @@ export function isBefore (input, units) {
 }
 
 export function isBetween (from, to, units, inclusivity) {
-    if (inclusivity === '(]') {
-        return this.isAfter(from, units) && this.isSameOrBefore(to, units);
-    }else if (inclusivity === '[)') {
-        return this.isSameOrAfter(from, units) && this.isBefore(to, units);
-    }else if (inclusivity === '[]') {
-        return !(this.isBefore(from, units) || this.isAfter(to, units));
-    }
-    return this.isAfter(from, units) && this.isBefore(to, units);
+    inclusivity = inclusivity || '()';
+    return (inclusivity[0] === '(' ? this.isAfter(from, units) : !this.isBefore(from, units)) &&
+        (inclusivity[1] === ')' ? this.isBefore(to, units) : !this.isAfter(to, units));
 }
 
 export function isSame (input, units) {