updates timezone conversions

2 files changed, 3 insertions, 4 deletions

diff --git a/index.html b/index.html
index d8aca24..fd61dbf 100644
--- a/index.html
+++ b/index.html
@@ -829,6 +829,7 @@ var startDateTextBox = $('#rest_example_4_start');
 var endDateTextBox = $('#rest_example_4_end');
 
 startDateTextBox.datetimepicker({ 
+	timeFormat: 'HH:mm z',
 	onClose: function(dateText, inst) {
 		if (endDateTextBox.val() != '') {
 			var testStartDate = startDateTextBox.datetimepicker('getDate');
@@ -845,6 +846,7 @@ startDateTextBox.datetimepicker({
 	}
 });
 endDateTextBox.datetimepicker({ 
+	timeFormat: 'HH:mm z',
 	onClose: function(dateText, inst) {
 		if (startDateTextBox.val() != '') {
 			var testStartDate = startDateTextBox.datetimepicker('getDate');
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index e02e8ca..d2f74eb 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -1968,10 +1968,7 @@
 	$.timepicker.timezoneAdjust = function(date, toTimezone) {
 		var toTz = $.timepicker.timezoneOffsetNumber(toTimezone);
 		if(!isNaN(toTz)){
-			var currTz = date.getTimezoneOffset()*-1,
-				diff = currTz - toTz; // difference in minutes
-
-			date.setMinutes(date.getMinutes()+diff);
+			date.setMinutes(date.getMinutes()*1 + (date.getTimezoneOffset()*-1 - toTz*1) );
 		}
 		return date;
 	};