properly apply inputTZ option

Author: nsonnad

src/js/charts/cb-xy/parse-xy.js

@@ -23,10 +23,17 @@ function parseXY(config, _chartProps, callback, parseOpts) {
 	// clone so that we aren't modifying original
 	// this can probably be avoided by applying new settings differently
 	var chartProps = JSON.parse(JSON.stringify(_chartProps));
+
 	var bySeries = dataBySeries(chartProps.input.raw, {
 		checkForDate: true,
 		type: chartProps.input.type,
-		inputTZ: chartProps.input.inputTZ
+		inputTZ: (function() {
+			if (chartProps.scale.dateSettings) {
+				return chartProps.scale.dateSettings.inputTZ;
+			} else {
+				return "Z";
+			}
+		})()
 	});
 
 	var labels = chartProps._annotations.labels;

src/js/components/chart-grid/ChartGridXY.jsx

@@ -372,8 +372,8 @@ function drawXYChartGrid(el, state) {
 			var inputOffset = state.chartProps.scale.dateSettings.inputTZ ? -help.TZOffsetToMinutes(state.chartProps.scale.dateSettings.inputTZ) : curOffset;
 			var timeOffset = 0;
 			axis.tickFormat(function(d,i) {
-				if(displayTZ === "localized") {
-					timeOffset = inputOffset - curOffset;
+				if(displayTZ === "as-entered") {
+					timeOffset = curOffset - inputOffset;
 				}
 
 				return dateSettings.dateFormatter(d.clone(),i,timeOffset);

src/js/components/chart-xy/XYRenderer.jsx

@@ -759,8 +759,8 @@ function drawXY(el, state) {
 				var inputOffset = state.chartProps.scale.dateSettings.inputTZ ? -help.TZOffsetToMinutes(state.chartProps.scale.dateSettings.inputTZ) : curOffset;
 				var timeOffset = 0;
 				axis.tickFormat(function(d,i) {
-					if (displayTZ === "localized") {
-						timeOffset = inputOffset - curOffset;
+					if (displayTZ === "as-entered") {
+						timeOffset = curOffset - inputOffset;
 					}
 					return dateSettings.dateFormatter(d.clone(),i,timeOffset);
 				});

src/js/stores/SessionStore.js

@@ -10,10 +10,10 @@ var _session = {
 	separators: detectNumberSeparators(),
 	emSize: 10,
 	width: 640,
-	timerOn: function() {
+	timerOn: (function() {
 		if (localStorage) return ( localStorage.hasOwnProperty("model") === true );
 		return false;
-	},
+	})(),
 	nowOffset: getTZOffset(now),
 	now: now
 };

src/js/util/helper.js

@@ -216,7 +216,7 @@ function merge_or_apply(defaults, source) {
 }
 
 /**
- * Given a the domain of a scale suggest the most numerous number 
+ * Given a the domain of a scale suggest the most numerous number
  * of round number ticks that it cold be divided into while still containing
  values evenly divisible by 1, 2, 2.5, 5, 10, or 25.
  * @param {array} domain - An array of two number like objects

src/js/util/parse-delimited-input.js

@@ -101,9 +101,9 @@ function cast_data(input, columnNames, stripCharsRegex, opts) {
 	var all_entry_values = [];
 
 	var found_timezones = tz_pattern.test(input);
+	var offset = opts.inputTZ !== null ? -help.TZOffsetToMinutes(opts.inputTZ) : curOffset;
 
 	var data = dsv.parse(input, function(d,ii) {
-		var offset = opts.inputTZ !== null ? -help.TZOffsetToMinutes(opts.inputTZ) : curOffset;
 		each(columnNames, function(column, i) {
 			if (i === 0) {
 				//first column