Skip to content

Commit 32730b5

Browse files
Updates trentrichardson#213 and trentrichardson#622 for date defaulting to 1899
1 parent 9d86a29 commit 32730b5

7 files changed

+27
-14
lines changed

Gruntfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ module.exports = function(grunt) {
119119
},
120120
src: {
121121
files: 'src/**',//'<%= jshint.src.src %>',
122-
//tasks: ['jshint:src', 'jasmine', 'clean', 'copy', 'concat', 'replace', 'uglify', 'cssmin']
123-
tasks: ['jshint:src', 'jasmine']
122+
tasks: ['jshint:src', 'jasmine', 'clean', 'copy', 'concat', 'replace', 'uglify', 'cssmin']
123+
//tasks: ['jshint:src', 'jasmine']
124124
},
125125
test: {
126126
files: '<%= jshint.test.src %>',

dist/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ <h3>Requirements</h3>
127127
<h3>Version</h3>
128128
<p>Version 1.3.2</p>
129129

130-
<p>Last updated on 2013-07-31</p>
130+
<p>Last updated on 2013-08-11</p>
131131
<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>
132132
<p><a href="http://trentrichardson.com/Impromptu/MIT-LICENSE.txt" title="MIT License">MIT License</a></p>
133133

@@ -940,7 +940,7 @@ <h3 id="utility_examples">Utilities</h3>
940940
</div>
941941

942942

943-
<script type="text/javascript" src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
943+
<script type="text/javascript" src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
944944
<script type="text/javascript" src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
945945
<script type="text/javascript" src="jquery-ui-timepicker-addon.js"></script>
946946
<script type="text/javascript" src="jquery-ui-sliderAccess.js"></script>

dist/jquery-ui-timepicker-addon.js

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! jQuery Timepicker Addon - v1.3.2 - 2013-07-31
1+
/*! jQuery Timepicker Addon - v1.3.2 - 2013-08-11
22
* http://trentrichardson.com/examples/timepicker
33
* Copyright (c) 2013 Trent Richardson; Licensed MIT */
44
(function ($) {
@@ -696,6 +696,9 @@
696696
* on time change is also called when the time is updated in the text field
697697
*/
698698
_onTimeChange: function () {
699+
if (!this._defaults.showTimepicker) {
700+
return;
701+
}
699702
var hour = (this.hour_slider) ? this.control.value(this, this.hour_slider, 'hour') : false,
700703
minute = (this.minute_slider) ? this.control.value(this, this.minute_slider, 'minute') : false,
701704
second = (this.second_slider) ? this.control.value(this, this.second_slider, 'second') : false,
@@ -813,8 +816,12 @@
813816
*/
814817
_updateDateTime: function (dp_inst) {
815818
dp_inst = this.inst || dp_inst;
816-
//var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
817-
var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)),
819+
var dtTmp = (dp_inst.currentYear > 0?
820+
new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay) :
821+
new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
822+
dt = $.datepicker._daylightSavingAdjust(dtTmp),
823+
//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
824+
//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)),
818825
dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
819826
formatCfg = $.datepicker._getFormatConfig(dp_inst),
820827
timeAvailable = dt !== null && this.timeDefined;
@@ -1479,6 +1486,7 @@
14791486
var tp_inst = this._get(inst, 'timepicker');
14801487
$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
14811488
if (tp_inst) {
1489+
inst.settings.showTimepicker = false;
14821490
tp_inst._defaults.showTimepicker = false;
14831491
tp_inst._updateDateTime(inst);
14841492
}
@@ -1493,6 +1501,7 @@
14931501
var tp_inst = this._get(inst, 'timepicker');
14941502
$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
14951503
if (tp_inst) {
1504+
inst.settings.showTimepicker = true;
14961505
tp_inst._defaults.showTimepicker = true;
14971506
tp_inst._addTimePicker(inst); // Could be disabled on page load
14981507
tp_inst._updateDateTime(inst);

dist/jquery-ui-timepicker-addon.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery-ui-timepicker-addon.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/docs/footer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</div>
55

66

7-
<script type="text/javascript" src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
7+
<script type="text/javascript" src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
88
<script type="text/javascript" src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
99
<script type="text/javascript" src="jquery-ui-timepicker-addon.js"></script>
1010
<script type="text/javascript" src="jquery-ui-sliderAccess.js"></script>

src/jquery-ui-timepicker-addon.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -822,8 +822,12 @@
822822
*/
823823
_updateDateTime: function (dp_inst) {
824824
dp_inst = this.inst || dp_inst;
825-
//var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
826-
var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)),
825+
var dtTmp = (dp_inst.currentYear > 0?
826+
new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay) :
827+
new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
828+
dt = $.datepicker._daylightSavingAdjust(dtTmp),
829+
//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
830+
//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)),
827831
dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
828832
formatCfg = $.datepicker._getFormatConfig(dp_inst),
829833
timeAvailable = dt !== null && this.timeDefined;

0 commit comments

Comments
 (0)