From: tomerle <tomerle@users.noreply.github.com>
Date: Wed, 16 Sep 2020 11:36:37 +0000 (+0300)
Subject: [misc] Use new `get()` more (#2659)
X-Git-Tag: 2.30.0~13^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=072f0ab8c12683e8b27d17d9d94af064aff1c007;p=thirdparty%2Fmoment.git

[misc] Use new `get()` more (#2659)

- Use it in `getSetDayOfWeek`
- Also update style and comments for commented out `set()` cases
---

diff --git a/src/lib/moment/get-set.js b/src/lib/moment/get-set.js
index d6a7f6690..526740f49 100644
--- a/src/lib/moment/get-set.js
+++ b/src/lib/moment/get-set.js
@@ -35,7 +35,8 @@ export function get(mom, unit) {
             return isUTC ? d.getUTCHours() : d.getHours();
         case 'Date':
             return isUTC ? d.getUTCDate() : d.getDate();
-        // case 'Day': return isUTC ? d.getUTCDay() : d.getDay(); // Not used
+        case 'Day':
+            return isUTC ? d.getUTCDay() : d.getDay();
         case 'Month':
             return isUTC ? d.getUTCMonth() : d.getMonth();
         case 'FullYear':
@@ -68,8 +69,10 @@ export function set(mom, unit, value) {
             return void (isUTC ? d.setUTCHours(value) : d.setHours(value));
         case 'Date':
             return void (isUTC ? d.setUTCDate(value) : d.setDate(value));
-        // case 'Day': return void (isUTC ? d.setUTCDay(value) : d.setDay(value)); // Not real
-        // case 'Month': return void (isUTC ? d.setUTCMonth(value) : d.setMonth(value)); // Not used
+        // case 'Day': // Not real
+        //    return void (isUTC ? d.setUTCDay(value) : d.setDay(value));
+        // case 'Month': // Not used because we need to pass two variables
+        //     return void (isUTC ? d.setUTCMonth(value) : d.setMonth(value));
         case 'FullYear':
             break; // See below ...
         default:
diff --git a/src/lib/units/day-of-week.js b/src/lib/units/day-of-week.js
index 7d5d038aa..4cdc4d4a8 100644
--- a/src/lib/units/day-of-week.js
+++ b/src/lib/units/day-of-week.js
@@ -1,3 +1,4 @@
+import { get } from '../moment/get-set';
 import { addFormatToken } from '../format/format';
 import {
     addRegexToken,
@@ -283,7 +284,8 @@ export function getSetDayOfWeek(input) {
     if (!this.isValid()) {
         return input != null ? this : NaN;
     }
-    var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
+
+    var day = get(this, 'Day');
     if (input != null) {
         input = parseWeekday(input, this.localeData());
         return this.add(input - day, 'd');