plotly · alexcjohnson · Nov 15, 2016 · Nov 15, 2016 · Nov 15, 2016 · Nov 16, 2016
diff --git a/src/components/rangeselector/get_update_object.js b/src/components/rangeselector/get_update_object.js
@@ -42,13 +42,13 @@ function getXRange(axisLayout, buttonLayout) {
 
     switch(buttonLayout.stepmode) {
         case 'backward':
-            range0 = Lib.ms2DateTime(+d3.time[step].offset(base, -count));
+            range0 = Lib.ms2DateTime(+d3.time[step].utc.offset(base, -count));
             break;
 
         case 'todate':
-            var base2 = d3.time[step].offset(base, -count);
+            var base2 = d3.time[step].utc.offset(base, -count);
 
-            range0 = Lib.ms2DateTime(+d3.time[step].ceil(base2));
+            range0 = Lib.ms2DateTime(+d3.time[step].utc.ceil(base2));
             break;
     }
 

diff --git a/src/lib/index.js b/src/lib/index.js
@@ -28,6 +28,7 @@ var datesModule = require('./dates');
 lib.dateTime2ms = datesModule.dateTime2ms;
 lib.isDateTime = datesModule.isDateTime;
 lib.ms2DateTime = datesModule.ms2DateTime;
+lib.ms2DateTimeLocal = datesModule.ms2DateTimeLocal;
 lib.cleanDate = datesModule.cleanDate;
 lib.isJSDate = datesModule.isJSDate;
 lib.MIN_MS = datesModule.MIN_MS;

diff --git a/test/jasmine/tests/annotations_test.js b/test/jasmine/tests/annotations_test.js
@@ -71,7 +71,10 @@ describe('Test annotations', function() {
                     axref: 'x',
                     ayref: 'y',
                     x: '2008-07-01',
-                    ax: Dates.dateTime2ms('2004-07-01'),
+                    // note this is not portable: this generates ms in the local
+                    // timezone, so will work correctly where it was created but
+                    // not if the milliseconds number is moved to another TZ
+                    ax: +(new Date(2004, 6, 1)),
                     y: 0,
                     ay: 50
                 }]

diff --git a/test/jasmine/tests/axes_test.js b/test/jasmine/tests/axes_test.js
@@ -678,7 +678,7 @@ describe('Test axes', function() {
 
         it('should handle tick0 and dtick for date axes', function() {
             var someMs = 123456789,
-                someMsDate = Lib.ms2DateTime(someMs),
+                someMsDate = Lib.ms2DateTimeLocal(someMs),
                 oneDay = 24 * 3600 * 1000,
                 axIn = {tick0: someMs, dtick: String(3 * oneDay)},
                 axOut = {};

diff --git a/test/jasmine/tests/shapes_test.js b/test/jasmine/tests/shapes_test.js
@@ -489,7 +489,7 @@ describe('Test shapes', function() {
             title: 'linked to date and category axes',
             xaxis: {
                 type: 'date',
-                range: ['2000-01-01', (new Date(2000, 1, 2)).getTime()]
+                range: ['2000-01-01', '2000-02-02']
             },
             yaxis: { type: 'category', range: ['a', 'b'] }
         }