Skip to content
Closed
Changes from 6 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
4e02851
Fix global o variable
trentrichardson Feb 28, 2012
562d346
1.0.1-dev
trentrichardson Feb 28, 2012
610129e
No errors when call public methods from input without datepicker inst…
Feb 29, 2012
06b9afe
Fixed typo for iso8601
jun66j5 Feb 29, 2012
d33d08f
Merge pull request #327 from aparshin/dev
trentrichardson Feb 29, 2012
a446965
Merge pull request #328 from jun66j5/dev
trentrichardson Feb 29, 2012
e7c7d40
Add $.datepicker.parseDateTime(), $.datepicker.parseTime() functions
aparshin Mar 5, 2012
8929e4a
Merge remote-tracking branch 'remotes/trent/dev' into parseDateTime
aparshin Mar 7, 2012
0e00e8b
Minor refactoring after code review
aparshin Mar 7, 2012
e0cdb18
Merge pull request #332 from aparshin/parseDateTime
trentrichardson Mar 7, 2012
5302e3e
Fix missing comma by Ximik
trentrichardson Mar 15, 2012
ca698f3
Fix time only issue within _parseTime
trentrichardson Mar 16, 2012
704c0b9
fix formatting
trentrichardson Mar 16, 2012
313e55d
Pick the current timezone of the browser by default.
apepper Mar 20, 2012
d04b8bd
Update license
trentrichardson Mar 20, 2012
3b33871
Default timezone by kapouer
trentrichardson Mar 22, 2012
ea30cab
revert change
trentrichardson Mar 22, 2012
480135a
Merge pull request #338 from apepper/autoselect_current_timezone
trentrichardson Mar 22, 2012
d28b5db
Set timezone to default by kapouer
trentrichardson Mar 22, 2012
4378827
Use defaultTimezone, when a time is already set.
apepper Mar 23, 2012
22e6f87
Wrong parameter names - fix date not being set to selected
kapouer Mar 23, 2012
ab26e51
Check local timezone again, when changing the date (e.g. daylight sav…
apepper Mar 23, 2012
64ada98
Merge pull request #343 from apepper/timezone_default
trentrichardson Mar 23, 2012
e657640
Merge pull request #346 from kapouer/patch-3
trentrichardson Mar 23, 2012
50dd6d1
Fix usage of _defaults.useLocalTimezone
kapouer Mar 25, 2012
d6cc2ce
Refactored internals to calculate the timeZoneString.
apepper Mar 26, 2012
41e6a18
If the timezone of the given date matches the local timezone, use loc…
apepper Mar 26, 2012
be74879
Strict fixes by codeactual
trentrichardson Mar 26, 2012
9ed4ffd
Merge pull request #347 from kapouer/patch-4
trentrichardson Mar 26, 2012
4584407
Update timezone even when showTimezone is false by kapouer
trentrichardson Mar 26, 2012
a9a4550
Merge pull request #350 from apepper/tz_autoselect
trentrichardson Mar 26, 2012
a87b317
add demo by copying homepage
grosser Apr 20, 2012
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions jquery-ui-timepicker-addon.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* jQuery timepicker addon
* By: Trent Richardson [http://trentrichardson.com]
* Version 1.0.0-dev
* Version 1.0.1-dev
* Last Modified: 02/05/2012
*
* Copyright 2012 Trent Richardson
Expand All @@ -26,7 +26,7 @@ if ($.ui.timepicker.version) {
return;
}

$.extend($.ui, { timepicker: { version: "1.0.0" } });
$.extend($.ui, { timepicker: { version: "1.0.1" } });

//#######################################################################################
// Return regexp to parse possible am/pm time postfixes.
Expand Down Expand Up @@ -166,7 +166,7 @@ function Timepicker() {
separator: ' ',
altFieldTimeOnly: true,
showTimepicker: true,
timezoneIso8609: false,
timezoneIso8601: false,
timezoneList: null,
addSliderAccess: false,
sliderAccessArgs: null
Expand Down Expand Up @@ -254,7 +254,7 @@ $.extend(Timepicker.prototype, {
var timezoneList = [];
for (var i = -11; i <= 12; i++)
timezoneList.push((i >= 0 ? '+' : '-') + ('0' + Math.abs(i).toString()).slice(-2) + '00');
if (tp_inst._defaults.timezoneIso8609)
if (tp_inst._defaults.timezoneIso8601)
timezoneList = $.map(timezoneList, function(val) {
return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
});
Expand Down Expand Up @@ -998,16 +998,16 @@ $.datepicker.parseTime = function(timeFormat, timeString, options) {
var tz = treg[order.z].toUpperCase();
switch (tz.length) {
case 1: // Z
tz = o.timezoneIso8609 ? 'Z' : '+0000';
tz = o.timezoneIso8601 ? 'Z' : '+0000';
break;
case 5: // +hhmm
if (o.timezoneIso8609)
if (o.timezoneIso8601)
tz = tz.substring(1) == '0000'
? 'Z'
: tz.substring(0, 3) + ':' + tz.substring(3);
break;
case 6: // +hh:mm
if (!o.timezoneIso8609)
if (!o.timezoneIso8601)
tz = tz == 'Z' || tz.substring(1) == '00:00'
? '+0000'
: tz.replace(/:/, '');
Expand Down Expand Up @@ -1192,7 +1192,7 @@ $.datepicker._gotoToday = function(id) {
tzoffset = Math.abs(tzoffset);
var tzmin = tzoffset % 60;
tzoffset = tzsign + ('0' + (tzoffset - tzmin) / 60).slice(-2) + ('0' + tzmin).slice(-2);
if (tp_inst._defaults.timezoneIso8609)
if (tp_inst._defaults.timezoneIso8601)
tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
tp_inst.timezone_select.val(tzoffset);
}
Expand Down Expand Up @@ -1410,6 +1410,6 @@ function extendRemove(target, props) {
};

$.timepicker = new Timepicker(); // singleton instance
$.timepicker.version = "1.0.0";
$.timepicker.version = "1.0.1";

})(jQuery);