Changed Today button to Now (localized) and Now button includes time
This commit is contained in:
parent
4f75af447c
commit
a4f3cf111f
9
jquery-ui-timepicker-addon.js
vendored
9
jquery-ui-timepicker-addon.js
vendored
|
@ -1,8 +1,8 @@
|
||||||
/*
|
/*
|
||||||
* jQuery timepicker addon
|
* jQuery timepicker addon
|
||||||
* By: Trent Richardson [http://trentrichardson.com]
|
* By: Trent Richardson [http://trentrichardson.com]
|
||||||
* Version 0.6
|
* Version 0.6.1
|
||||||
* Last Modified: 9/15/2010
|
* Last Modified: 9/20/2010
|
||||||
*
|
*
|
||||||
* Copyright 2010 Trent Richardson
|
* Copyright 2010 Trent Richardson
|
||||||
* Dual licensed under the MIT and GPL licenses.
|
* Dual licensed under the MIT and GPL licenses.
|
||||||
|
@ -88,8 +88,7 @@
|
||||||
|
|
||||||
if (!this.defaults.timeOnly) {
|
if (!this.defaults.timeOnly) {
|
||||||
//the time should come after x number of characters and a space. x = at least the length of text specified by the date format
|
//the time should come after x number of characters and a space. x = at least the length of text specified by the date format
|
||||||
var dp_dateFormat = $.datepicker._get(dp_inst, 'dateFormat');
|
regstr = '.{' + this.defaults.dateFormat.length + ',}\\s+' + regstr;
|
||||||
regstr = '.{' + dp_dateFormat.length + ',}\\s+' + regstr;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var order = this.getFormatPositions();
|
var order = this.getFormatPositions();
|
||||||
|
@ -490,3 +489,5 @@
|
||||||
|
|
||||||
$.timepicker = new Timepicker(true); // singleton instance
|
$.timepicker = new Timepicker(true); // singleton instance
|
||||||
})(jQuery);
|
})(jQuery);
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue