Merge pull request w3c#480 from Tchanders/utc-option

Fix issue w3c#479

src/js/charts/bar.js

@@ -299,7 +299,7 @@
                     })
                     .attr('opacity', 0.3);
 
-                var fmt = d3.time.format('%b %e, %Y');
+                var fmt = MG.time_format(args.utc_time, '%b %e, %Y');
                 var num = format_rollover_number(args);
 
                 //highlight active bar

src/js/charts/histogram.js

@@ -130,7 +130,7 @@
 
         this.rolloverOn = function(args) {
             var svg = mg_get_svg_child_of(args.target);
-            var x_formatter = d3.time.format('%Y-%m-%d');
+            var x_formatter = MG.time_format(args.utc_time, '%Y-%m-%d');
 
             return function(d, i) {
                 svg.selectAll('text')
@@ -139,7 +139,7 @@
                     })
                     .attr('opacity', 0.3);
 
-                var fmt = d3.time.format('%b %e, %Y');
+                var fmt = MG.time_format(args.utc_time, '%b %e, %Y');
                 var num = format_rollover_number(args);
 
                 svg.selectAll('.mg-bar rect')

src/js/charts/point.js

@@ -141,7 +141,7 @@
                         });
                 }
 
-                var fmt = d3.time.format('%b %e, %Y');
+                var fmt = MG.time_format(args.utc_time, '%b %e, %Y');
                 var num = format_rollover_number(args);
 
                 //update rollover text

src/js/common/data_graphic.js

@@ -74,6 +74,7 @@ MG.data_graphic = function(args) {
         markers: null,                         // sets the marker lines
         scalefns: {},
         scales: {},
+        utc_time: false,
         show_year_markers: false,
         show_secondary_x_label: true,
         target: '#viz',

src/js/common/x_axis.js

@@ -67,8 +67,12 @@ function x_axis(args) {
 
     mg_find_min_max_x(args);
 
+    var time_scale = (args.utc_time)
+        ? d3.time.scale.utc()
+        : d3.time.scale();
+
     args.scales.X = (args.time_series)
-        ? d3.time.scale()
+        ? time_scale
         : d3.scale.linear();
 
     args.scales.X
@@ -303,15 +307,15 @@ function mg_get_time_frame(diff){
     return time_frame;
 }
 
-function mg_get_time_format(diff){
+function mg_get_time_format(utc, diff){
     if (diff < 60) {
-        main_time_format = d3.time.format('%M:%S');
+        main_time_format = MG.time_format(utc, '%M:%S');
     } else if (diff / (60 * 60) <= 24) {
-        main_time_format = d3.time.format('%H:%M');
+        main_time_format = MG.time_format(utc, '%H:%M');
     } else if (diff / (60 * 60) <= 24 * 4) {
-        main_time_format = d3.time.format('%H:%M');
+        main_time_format = MG.time_format(utc, '%H:%M');
     } else {
-        main_time_format = d3.time.format('%b %d');
+        main_time_format = MG.time_format(utc, '%b %d');
     }
     return main_time_format;
 }
@@ -331,13 +335,13 @@ function mg_default_xax_format(args) {
             diff = (args.processed.max_x - args.processed.min_x) / 1000;
 
             time_frame = mg_get_time_frame(diff);
-            main_time_format = mg_get_time_format(diff);
+            main_time_format = mg_get_time_format(args.utc_time, diff);
         }
 
         args.processed.main_x_time_format = main_time_format;
         args.processed.x_time_frame = time_frame;
 
-        var df = d3.time.format('%b %d');
+        var df = MG.time_format(args.utc_time, '%b %d');
         var pf = d3.formatPrefix(d);
 
         // format as date or not, of course user can pass in
@@ -439,19 +443,19 @@ function mg_add_x_tick_labels(g, args) {
         switch(time_frame) {
             case 'seconds':
                 secondary_function = d3.time.days;
-                yformat = d3.time.format('%I %p');
+                yformat = MG.time_format(args.utc_time, '%I %p');
                 break;
             case 'less-than-a-day':
                 secondary_function = d3.time.days;
-                yformat = d3.time.format('%b %d');
+                yformat = MG.time_format(args.utc_time, '%b %d');
                 break;
             case 'four-days':
                 secondary_function = d3.time.days;
-                yformat = d3.time.format('%b %d');
+                yformat = MG.time_format(args.utc_time, '%b %d');
                 break;
             default:
                 secondary_function = d3.time.years;
-                yformat = d3.time.format('%Y');
+                yformat = MG.time_format(args.utc_time, '%Y');
         }
 
         var years = secondary_function(args.processed.min_x, args.processed.max_x);

src/js/misc/utility.js

@@ -22,6 +22,9 @@ MG.convert.number = function(data, accessor) {
     return data;
 };
 
+MG.time_format = function(utc, specifier) {
+    return utc ? d3.time.format.utc(specifier) : d3.time.format(specifier);
+};
 
 function is_array(thing){
     return Object.prototype.toString.call(thing) === '[object Array]';