highcharts 7.1.1 → 7.1.2

package/es-modules/parts/Time.js

@@ -1,25 +1,29 @@
 /* *
- * (c) 2010-2019 Torstein Honsi
  *
- * License: www.highcharts.com/license
- */
-
+ *  (c) 2010-2019 Torstein Honsi
+ *
+ *  License: www.highcharts.com/license
+ *
+ *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+ *
+ * */
+'use strict';
+import Highcharts from './Globals.js';
 /**
  * Normalized interval.
  *
  * @interface Highcharts.NormalizedIntervalObject
- *//**
- * The interval in axis values (ms).
- *
- * @name Highcharts.NormalizedIntervalObject#unitRange
- * @type {number}
- *//**
- * The count.
- *
- * @name Highcharts.NormalizedIntervalObject#count
- * @type {number}
- */
-
+ */ /**
+* The count.
+*
+* @name Highcharts.NormalizedIntervalObject#count
+* @type {number}
+*/ /**
+* The interval in axis values (ms).
+*
+* @name Highcharts.NormalizedIntervalObject#unitRange
+* @type {number}
+*/
 /**
  * Function of an additional date format specifier.
  *
@@ -31,42 +35,29 @@
  * @return {string}
  *         The formatted portion of the date.
  */
-
 /**
  * Additonal time tick information.
  *
  * @interface Highcharts.TimeTicksInfoObject
  * @augments Highcharts.NormalizedIntervalObject
- *//**
- * @name Highcharts.TimeTicksInfoObject#higherRanks
- * @type {Array<string>}
- *//**
- * @name Highcharts.TimeTicksInfoObject#totalRange
- * @type {number}
- */
-
+ */ /**
+* @name Highcharts.TimeTicksInfoObject#higherRanks
+* @type {Array<string>}
+*/ /**
+* @name Highcharts.TimeTicksInfoObject#totalRange
+* @type {number}
+*/
 /**
  * Time ticks.
  *
  * @interface Highcharts.TimeTicksObject
  * @augments Array<number>
- *//**
- * @name Highcharts.TimeTicksObject#info
- * @type {Highcharts.TimeTicksInfoObject}
- */
-
-'use strict';
-
-import Highcharts from './Globals.js';
-
-var H = Highcharts,
-    defined = H.defined,
-    extend = H.extend,
-    merge = H.merge,
-    pick = H.pick,
-    timeUnits = H.timeUnits,
-    win = H.win;
-
+ */ /**
+* @name Highcharts.TimeTicksObject#info
+* @type {Highcharts.TimeTicksInfoObject}
+*/
+var H = Highcharts, defined = H.defined, extend = H.extend, merge = H.merge, pick = H.pick, timeUnits = H.timeUnits, win = H.win;
+/* eslint-disable no-invalid-this, valid-jsdoc */
 /**
  * The Time class. Time settings are applied in general for each page using
  * `Highcharts.setOptions`, or individually for each Chart item through the
@@ -111,9 +102,7 @@ var H = Highcharts,
 Highcharts.Time = function (options) {
     this.update(options, false);
 };
-
 Highcharts.Time.prototype = {
-
     /**
      * Time options that can apply globally or to individual charts. These
      * settings affect how `datetime` axes are laid out, how tooltips are
@@ -165,7 +154,6 @@ Highcharts.Time.prototype = {
      * @since     6.0.5
      * @apioption time
      */
-
     /**
      * Whether to use UTC time for axis scaling, tickmark placement and
      * time display in `Highcharts.dateFormat`. Advantages of using UTC
@@ -183,7 +171,6 @@ Highcharts.Time.prototype = {
      * @default   true
      * @apioption time.useUTC
      */
-
     /**
      * A custom `Date` class for advanced date handling. For example,
      * [JDate](https://github.com/tahajahangir/jdate) can be hooked in to
@@ -194,7 +181,6 @@ Highcharts.Time.prototype = {
      * @product   highcharts highstock gantt
      * @apioption time.Date
      */
-
     /**
      * A callback to return the time zone offset for a given datetime. It
      * takes the timestamp in terms of milliseconds since January 1 1970,
@@ -212,7 +198,6 @@ Highcharts.Time.prototype = {
      * @product   highcharts highstock gantt
      * @apioption time.getTimezoneOffset
      */
-
     /**
      * Requires [moment.js](http://momentjs.com/). If the timezone option
      * is specified, it creates a default
@@ -231,7 +216,6 @@ Highcharts.Time.prototype = {
      * @product   highcharts highstock gantt
      * @apioption time.timezone
      */
-
     /**
      * The timezone offset in minutes. Positive values are west, negative
      * values are east of UTC, as in the ECMAScript
@@ -249,9 +233,7 @@ Highcharts.Time.prototype = {
      * @product   highcharts highstock gantt
      * @apioption time.timezoneOffset
      */
-
     defaultOptions: {},
-
     /**
      * Update the Time object with current options. It is called internally on
      * initializing Highcharts, after running `Highcharts.setOptions` and on
@@ -261,19 +243,16 @@ Highcharts.Time.prototype = {
      * @function Highcharts.Time#update
      *
      * @param {Highcharts.TimeOptions} options
+     *
+     * @return {void}
      */
     update: function (options) {
-        var useUTC = pick(options && options.useUTC, true),
-            time = this;
-
+        var useUTC = pick(options && options.useUTC, true), time = this;
         this.options = options = merge(true, this.options || {}, options);
-
         // Allow using a different Date class
         this.Date = options.Date || win.Date || Date;
-
         this.useUTC = useUTC;
-        this.timezoneOffset = useUTC && options.timezoneOffset;
-
+        this.timezoneOffset = (useUTC && options.timezoneOffset);
         /**
          * Get the time zone offset based on the current timezone information as
          * set in the global options.
@@ -287,78 +266,60 @@ Highcharts.Time.prototype = {
          *         The timezone offset in minutes compared to UTC.
          */
         this.getTimezoneOffset = this.timezoneOffsetFunction();
-
         /*
          * The time object has options allowing for variable time zones, meaning
          * the axis ticks or series data needs to consider this.
          */
-        this.variableTimezone = !!(
-            !useUTC ||
+        this.variableTimezone = !!(!useUTC ||
             options.getTimezoneOffset ||
-            options.timezone
-        );
-
+            options.timezone);
         // UTC time with timezone handling
         if (this.variableTimezone || this.timezoneOffset) {
             this.get = function (unit, date) {
-                var realMs = date.getTime(),
-                    ms = realMs - time.getTimezoneOffset(date),
-                    ret;
-
+                var realMs = date.getTime(), ms = realMs - time.getTimezoneOffset(date), ret;
                 date.setTime(ms); // Temporary adjust to timezone
                 ret = date['getUTC' + unit]();
                 date.setTime(realMs); // Reset
-
                 return ret;
             };
             this.set = function (unit, date, value) {
                 var ms, offset, newOffset;
-
                 // For lower order time units, just set it directly using local
                 // time
-                if (
-                    unit === 'Milliseconds' ||
+                if (unit === 'Milliseconds' ||
                     unit === 'Seconds' ||
-
                     // If we're dealting with minutes, we only need to
                     // consider timezone if we're in Indian time zones with
                     // half-hour offsets (#8768).
-                    (
-                        unit === 'Minutes' &&
-                        date.getTimezoneOffset() % 60 === 0
-                    )
-                ) {
+                    (unit === 'Minutes' &&
+                        date.getTimezoneOffset() % 60 === 0)) {
                     date['set' + unit](value);
-
-                // Higher order time units need to take the time zone into
-                // account
-                } else {
-
+                    // Higher order time units need to take the time zone into
+                    // account
+                }
+                else {
                     // Adjust by timezone
                     offset = time.getTimezoneOffset(date);
                     ms = date.getTime() - offset;
                     date.setTime(ms);
-
                     date['setUTC' + unit](value);
                     newOffset = time.getTimezoneOffset(date);
-
                     ms = date.getTime() + newOffset;
                     date.setTime(ms);
                 }
-
             };
-
-        // UTC time with no timezone handling
-        } else if (useUTC) {
+            // UTC time with no timezone handling
+        }
+        else if (useUTC) {
             this.get = function (unit, date) {
                 return date['getUTC' + unit]();
             };
             this.set = function (unit, date, value) {
                 return date['setUTC' + unit](value);
             };
-
-        // Local time
-        } else {
+            // Local time
+        }
+        else {
             this.get = function (unit, date) {
                 return date['get' + unit]();
             };
@@ -366,9 +327,7 @@ Highcharts.Time.prototype = {
                 return date['set' + unit](value);
             };
         }
-
     },
-
     /**
      * Make a time and returns milliseconds. Interprets the inputs as UTC time,
      * local time or a specific timezone time depending on the current time
@@ -399,40 +358,28 @@ Highcharts.Time.prototype = {
      */
     makeTime: function (year, month, date, hours, minutes, seconds) {
         var d, offset, newOffset;
-
         if (this.useUTC) {
             d = this.Date.UTC.apply(0, arguments);
             offset = this.getTimezoneOffset(d);
             d += offset;
             newOffset = this.getTimezoneOffset(d);
-
             if (offset !== newOffset) {
                 d += newOffset - offset;
-
-            // A special case for transitioning from summer time to winter time.
-            // When the clock is set back, the same time is repeated twice, i.e.
-            // 02:30 am is repeated since the clock is set back from 3 am to
-            // 2 am. We need to make the same time as local Date does.
-            } else if (
-                offset - 36e5 === this.getTimezoneOffset(d - 36e5) &&
-                !H.isSafari
-            ) {
+                // A special case for transitioning from summer time to winter time.
+                // When the clock is set back, the same time is repeated twice, i.e.
+                // 02:30 am is repeated since the clock is set back from 3 am to
+                // 2 am. We need to make the same time as local Date does.
+            }
+            else if (offset - 36e5 === this.getTimezoneOffset(d - 36e5) &&
+                !H.isSafari) {
                 d -= 36e5;
             }
-
-        } else {
-            d = new this.Date(
-                year,
-                month,
-                pick(date, 1),
-                pick(hours, 0),
-                pick(minutes, 0),
-                pick(seconds, 0)
-            ).getTime();
+        }
+        else {
+            d = new this.Date(year, month, pick(date, 1), pick(hours, 0), pick(minutes, 0), pick(seconds, 0)).getTime();
         }
         return d;
     },
-
     /**
      * Sets the getTimezoneOffset function. If the `timezone` option is set, a
      * default getTimezoneOffset function with that timezone is returned. If
@@ -447,45 +394,35 @@ Highcharts.Time.prototype = {
      *         A getTimezoneOffset function
      */
     timezoneOffsetFunction: function () {
-        var time = this,
-            options = this.options,
-            moment = win.moment;
-
+        var time = this, options = this.options, moment = win.moment;
         if (!this.useUTC) {
             return function (timestamp) {
                 return new Date(timestamp).getTimezoneOffset() * 60000;
             };
         }
-
         if (options.timezone) {
             if (!moment) {
                 // getTimezoneOffset-function stays undefined because it depends
                 // on Moment.js
                 H.error(25);
-
-            } else {
+            }
+            else {
                 return function (timestamp) {
-                    return -moment.tz(
-                        timestamp,
-                        options.timezone
-                    ).utcOffset() * 60000;
+                    return -moment.tz(timestamp, options.timezone).utcOffset() * 60000;
                 };
             }
         }
-
         // If not timezone is set, look for the getTimezoneOffset callback
         if (this.useUTC && options.getTimezoneOffset) {
             return function (timestamp) {
                 return options.getTimezoneOffset(timestamp) * 60000;
             };
         }
-
         // Last, use the `timezoneOffset` option if set
         return function () {
             return (time.timezoneOffset || 0) * 60000;
         };
     },
-
     /**
      * Formats a JavaScript date timestamp (milliseconds since Jan 1st 1970)
      * into a human readable date string. The format is a subset of the formats
@@ -513,105 +450,79 @@ Highcharts.Time.prototype = {
             return H.defaultOptions.lang.invalidDate || '';
         }
         format = H.pick(format, '%Y-%m-%d %H:%M:%S');
-
-        var time = this,
-            date = new this.Date(timestamp),
-            // get the basic time values
-            hours = this.get('Hours', date),
-            day = this.get('Day', date),
-            dayOfMonth = this.get('Date', date),
-            month = this.get('Month', date),
-            fullYear = this.get('FullYear', date),
-            lang = H.defaultOptions.lang,
-            langWeekdays = lang.weekdays,
-            shortWeekdays = lang.shortWeekdays,
-            pad = H.pad,
-
-            // List all format keys. Custom formats can be added from the
-            // outside.
-            replacements = H.extend(
-                {
-
-                    // Day
-                    // Short weekday, like 'Mon'
-                    'a': shortWeekdays ?
-                        shortWeekdays[day] :
-                        langWeekdays[day].substr(0, 3),
-                    // Long weekday, like 'Monday'
-                    'A': langWeekdays[day],
-                    // Two digit day of the month, 01 to 31
-                    'd': pad(dayOfMonth),
-                    // Day of the month, 1 through 31
-                    'e': pad(dayOfMonth, 2, ' '),
-                    'w': day,
-
-                    // Week (none implemented)
-                    // 'W': weekNumber(),
-
-                    // Month
-                    // Short month, like 'Jan'
-                    'b': lang.shortMonths[month],
-                    // Long month, like 'January'
-                    'B': lang.months[month],
-                    // Two digit month number, 01 through 12
-                    'm': pad(month + 1),
-                    // Month number, 1 through 12 (#8150)
-                    'o': month + 1,
-
-                    // Year
-                    // Two digits year, like 09 for 2009
-                    'y': fullYear.toString().substr(2, 2),
-                    // Four digits year, like 2009
-                    'Y': fullYear,
-
-                    // Time
-                    // Two digits hours in 24h format, 00 through 23
-                    'H': pad(hours),
-                    // Hours in 24h format, 0 through 23
-                    'k': hours,
-                    // Two digits hours in 12h format, 00 through 11
-                    'I': pad((hours % 12) || 12),
-                    // Hours in 12h format, 1 through 12
-                    'l': (hours % 12) || 12,
-                    // Two digits minutes, 00 through 59
-                    'M': pad(time.get('Minutes', date)),
-                    // Upper case AM or PM
-                    'p': hours < 12 ? 'AM' : 'PM',
-                    // Lower case AM or PM
-                    'P': hours < 12 ? 'am' : 'pm',
-                    // Two digits seconds, 00 through  59
-                    'S': pad(date.getSeconds()),
-                    // Milliseconds (naming from Ruby)
-                    'L': pad(Math.floor(timestamp % 1000), 3)
-                },
-
-                H.dateFormats
-            );
-
-
+        var time = this, date = new this.Date(timestamp), 
+        // get the basic time values
+        hours = this.get('Hours', date), day = this.get('Day', date), dayOfMonth = this.get('Date', date), month = this.get('Month', date), fullYear = this.get('FullYear', date), lang = H.defaultOptions.lang, langWeekdays = lang.weekdays, shortWeekdays = lang.shortWeekdays, pad = H.pad, 
+        // List all format keys. Custom formats can be added from the
+        // outside.
+        replacements = H.extend({
+            // Day
+            // Short weekday, like 'Mon'
+            a: shortWeekdays ?
+                shortWeekdays[day] :
+                langWeekdays[day].substr(0, 3),
+            // Long weekday, like 'Monday'
+            A: langWeekdays[day],
+            // Two digit day of the month, 01 to 31
+            d: pad(dayOfMonth),
+            // Day of the month, 1 through 31
+            e: pad(dayOfMonth, 2, ' '),
+            w: day,
+            // Week (none implemented)
+            // 'W': weekNumber(),
+            // Month
+            // Short month, like 'Jan'
+            b: lang.shortMonths[month],
+            // Long month, like 'January'
+            B: lang.months[month],
+            // Two digit month number, 01 through 12
+            m: pad(month + 1),
+            // Month number, 1 through 12 (#8150)
+            o: month + 1,
+            // Year
+            // Two digits year, like 09 for 2009
+            y: fullYear.toString().substr(2, 2),
+            // Four digits year, like 2009
+            Y: fullYear,
+            // Time
+            // Two digits hours in 24h format, 00 through 23
+            H: pad(hours),
+            // Hours in 24h format, 0 through 23
+            k: hours,
+            // Two digits hours in 12h format, 00 through 11
+            I: pad((hours % 12) || 12),
+            // Hours in 12h format, 1 through 12
+            l: (hours % 12) || 12,
+            // Two digits minutes, 00 through 59
+            M: pad(time.get('Minutes', date)),
+            // Upper case AM or PM
+            p: hours < 12 ? 'AM' : 'PM',
+            // Lower case AM or PM
+            P: hours < 12 ? 'am' : 'pm',
+            // Two digits seconds, 00 through  59
+            S: pad(date.getSeconds()),
+            // Milliseconds (naming from Ruby)
+            L: pad(Math.floor(timestamp % 1000), 3)
+        }, H.dateFormats);
         // Do the replaces
         H.objectEach(replacements, function (val, key) {
             // Regex would do it in one line, but this is faster
             while (format.indexOf('%' + key) !== -1) {
-                format = format.replace(
-                    '%' + key,
-                    typeof val === 'function' ? val.call(time, timestamp) : val
-                );
+                format = format.replace('%' + key, typeof val === 'function' ? val.call(time, timestamp) : val);
             }
-
         });
-
         // Optionally capitalize the string and return
         return capitalize ?
-            format.substr(0, 1).toUpperCase() + format.substr(1) :
+            (format.substr(0, 1).toUpperCase() +
+                format.substr(1)) :
             format;
     },
-
     /**
      * Resolve legacy formats of dateTimeLabelFormats (strings and arrays) into
      * an object.
-     * @param  {String|Array|Object} f General format description
-     * @return {Object}   The object definition
+     * @private
+     * @param  {object|string} f - General format description
+     * @return {object} - The object definition
      */
     resolveDTLFormat: function (f) {
         if (!H.isObject(f, true)) {
@@ -624,7 +535,6 @@ Highcharts.Time.prototype = {
         }
         return f;
     },
-
     /**
      * Return an array with time positions distributed on round time values
      * right and right after min and max. Used in datetime axes as well as for
@@ -645,224 +555,130 @@ Highcharts.Time.prototype = {
      *
      * @return {Highcharts.TimeTicksObject}
      */
-    getTimeTicks: function (
-        normalizedInterval,
-        min,
-        max,
-        startOfWeek
-    ) {
-        var time = this,
-            Date = time.Date,
-            tickPositions = [],
-            i,
-            higherRanks = {},
-            minYear, // used in months and years as a basis for Date.UTC()
-            // When crossing DST, use the max. Resolves #6278.
-            minDate = new Date(min),
-            interval = normalizedInterval.unitRange,
-            count = normalizedInterval.count || 1,
-            variableDayLength,
-            minDay;
-
+    getTimeTicks: function (normalizedInterval, min, max, startOfWeek) {
+        var time = this, Date = time.Date, tickPositions = [], i, higherRanks = {}, minYear, // used in months and years as a basis for Date.UTC()
+        // When crossing DST, use the max. Resolves #6278.
+        minDate = new Date(min), interval = normalizedInterval.unitRange, count = normalizedInterval.count || 1, variableDayLength, minDay;
         startOfWeek = pick(startOfWeek, 1);
-
         if (defined(min)) { // #1300
-            time.set(
-                'Milliseconds',
-                minDate,
-                interval >= timeUnits.second ?
-                    0 : // #3935
-                    count * Math.floor(
-                        time.get('Milliseconds', minDate) / count
-                    )
-            ); // #3652, #3654
-
+            time.set('Milliseconds', minDate, interval >= timeUnits.second ?
+                0 : // #3935
+                count * Math.floor(time.get('Milliseconds', minDate) / count)); // #3652, #3654
             if (interval >= timeUnits.second) { // second
-                time.set(
-                    'Seconds',
-                    minDate,
-                    interval >= timeUnits.minute ?
-                        0 : // #3935
-                        count * Math.floor(time.get('Seconds', minDate) / count)
-                );
+                time.set('Seconds', minDate, interval >= timeUnits.minute ?
+                    0 : // #3935
+                    count * Math.floor(time.get('Seconds', minDate) / count));
             }
-
             if (interval >= timeUnits.minute) { // minute
-                time.set(
-                    'Minutes',
-                    minDate,
-                    interval >= timeUnits.hour ?
-                        0 :
-                        count * Math.floor(time.get('Minutes', minDate) / count)
-                );
+                time.set('Minutes', minDate, interval >= timeUnits.hour ?
+                    0 :
+                    count * Math.floor(time.get('Minutes', minDate) / count));
             }
-
             if (interval >= timeUnits.hour) { // hour
-                time.set(
-                    'Hours',
-                    minDate,
-                    interval >= timeUnits.day ?
-                        0 :
-                        count * Math.floor(
-                            time.get('Hours', minDate) / count
-                        )
-                );
+                time.set('Hours', minDate, interval >= timeUnits.day ?
+                    0 :
+                    count * Math.floor(time.get('Hours', minDate) / count));
             }
-
             if (interval >= timeUnits.day) { // day
-                time.set(
-                    'Date',
-                    minDate,
-                    interval >= timeUnits.month ?
-                        1 :
-                        Math.max(
-                            1,
-                            count * Math.floor(
-                                time.get('Date', minDate) / count
-                            )
-                        )
-                );
+                time.set('Date', minDate, interval >= timeUnits.month ?
+                    1 :
+                    Math.max(1, count * Math.floor(time.get('Date', minDate) / count)));
             }
-
             if (interval >= timeUnits.month) { // month
-                time.set(
-                    'Month',
-                    minDate,
-                    interval >= timeUnits.year ? 0 :
-                        count * Math.floor(time.get('Month', minDate) / count)
-                );
+                time.set('Month', minDate, interval >= timeUnits.year ? 0 :
+                    count * Math.floor(time.get('Month', minDate) / count));
                 minYear = time.get('FullYear', minDate);
             }
-
             if (interval >= timeUnits.year) { // year
                 minYear -= minYear % count;
                 time.set('FullYear', minDate, minYear);
             }
-
             // week is a special case that runs outside the hierarchy
             if (interval === timeUnits.week) {
                 // get start of current week, independent of count
                 minDay = time.get('Day', minDate);
-                time.set(
-                    'Date',
-                    minDate,
-                    (
-                        time.get('Date', minDate) -
-                        minDay + startOfWeek +
-                        // We don't want to skip days that are before
-                        // startOfWeek (#7051)
-                        (minDay < startOfWeek ? -7 : 0)
-                    )
-                );
+                time.set('Date', minDate, (time.get('Date', minDate) -
+                    minDay + startOfWeek +
+                    // We don't want to skip days that are before
+                    // startOfWeek (#7051)
+                    (minDay < startOfWeek ? -7 : 0)));
             }
-
-
             // Get basics for variable time spans
             minYear = time.get('FullYear', minDate);
-            var minMonth = time.get('Month', minDate),
-                minDateDate = time.get('Date', minDate),
-                minHours = time.get('Hours', minDate);
-
+            var minMonth = time.get('Month', minDate), minDateDate = time.get('Date', minDate), minHours = time.get('Hours', minDate);
             // Redefine min to the floored/rounded minimum time (#7432)
             min = minDate.getTime();
-
             // Handle local timezone offset
             if (time.variableTimezone) {
-
                 // Detect whether we need to take the DST crossover into
                 // consideration. If we're crossing over DST, the day length may
                 // be 23h or 25h and we need to compute the exact clock time for
                 // each tick instead of just adding hours. This comes at a cost,
                 // so first we find out if it is needed (#4951).
                 variableDayLength = (
-                    // Long range, assume we're crossing over.
-                    max - min > 4 * timeUnits.month ||
+                // Long range, assume we're crossing over.
+                max - min > 4 * timeUnits.month ||
                     // Short range, check if min and max are in different time
                     // zones.
-                    time.getTimezoneOffset(min) !== time.getTimezoneOffset(max)
-                );
+                    time.getTimezoneOffset(min) !==
+                        time.getTimezoneOffset(max));
             }
-
             // Iterate and add tick positions at appropriate values
             var t = minDate.getTime();
-
             i = 1;
             while (t < max) {
                 tickPositions.push(t);
-
                 // if the interval is years, use Date.UTC to increase years
                 if (interval === timeUnits.year) {
                     t = time.makeTime(minYear + i * count, 0);
-
-                // if the interval is months, use Date.UTC to increase months
-                } else if (interval === timeUnits.month) {
+                    // if the interval is months, use Date.UTC to increase months
+                }
+                else if (interval === timeUnits.month) {
                     t = time.makeTime(minYear, minMonth + i * count);
-
-                // if we're using global time, the interval is not fixed as it
-                // jumps one hour at the DST crossover
-                } else if (
-                    variableDayLength &&
-                    (interval === timeUnits.day || interval === timeUnits.week)
-                ) {
-                    t = time.makeTime(
-                        minYear,
-                        minMonth,
-                        minDateDate +
-                            i * count * (interval === timeUnits.day ? 1 : 7)
-                    );
-
-                } else if (
-                    variableDayLength &&
+                    // if we're using global time, the interval is not fixed as it
+                    // jumps one hour at the DST crossover
+                }
+                else if (variableDayLength &&
+                    (interval === timeUnits.day || interval === timeUnits.week)) {
+                    t = time.makeTime(minYear, minMonth, minDateDate +
+                        i * count * (interval === timeUnits.day ? 1 : 7));
+                }
+                else if (variableDayLength &&
                     interval === timeUnits.hour &&
-                    count > 1
-                ) {
+                    count > 1) {
                     // make sure higher ranks are preserved across DST (#6797,
                     // #7621)
-                    t = time.makeTime(
-                        minYear,
-                        minMonth,
-                        minDateDate,
-                        minHours + i * count
-                    );
-
-                // else, the interval is fixed and we use simple addition
-                } else {
+                    t = time.makeTime(minYear, minMonth, minDateDate, minHours + i * count);
+                    // else, the interval is fixed and we use simple addition
+                }
+                else {
                     t += interval * count;
                 }
-
                 i++;
             }
-
             // push the last time
             tickPositions.push(t);
-
-
             // Handle higher ranks. Mark new days if the time is on midnight
             // (#950, #1649, #1760, #3349). Use a reasonable dropout threshold
             // to prevent looping over dense data grouping (#6156).
             if (interval <= timeUnits.hour && tickPositions.length < 10000) {
                 tickPositions.forEach(function (t) {
                     if (
-                        // Speed optimization, no need to run dateFormat unless
-                        // we're on a full or half hour
-                        t % 1800000 === 0 &&
+                    // Speed optimization, no need to run dateFormat unless
+                    // we're on a full or half hour
+                    t % 1800000 === 0 &&
                         // Check for local or global midnight
-                        time.dateFormat('%H%M%S%L', t) === '000000000'
-                    ) {
+                        time.dateFormat('%H%M%S%L', t) === '000000000') {
                         higherRanks[t] = 'day';
                     }
                 });
             }
         }
-
-
         // record information on the chosen unit - for dynamic label formatter
         tickPositions.info = extend(normalizedInterval, {
             higherRanks: higherRanks,
             totalRange: interval * count
         });
-
         return tickPositions;
     }
-
 }; // end of Time