Skip to content

Commit 1eb8160

Browse files
committed
Issue 210: proper handling of year ranges
1 parent 9bf5594 commit 1eb8160

File tree

4 files changed

+59
-4
lines changed

4 files changed

+59
-4
lines changed

lib/jquery-1.5.min.js

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/dateinput/dateinput.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145

146146
function parseDate(val) {
147147

148-
if (!val) { return; }
148+
if (val === undefined) { return; }
149149
if (val.constructor == Date) { return val; }
150150

151151
if (typeof val == 'string') {
@@ -176,6 +176,7 @@
176176
// variables
177177
var self = this,
178178
now = new Date(),
179+
yearNow = now.getFullYear(),
179180
css = conf.css,
180181
labels = LABELS[conf.lang],
181182
root = $("#" + css.root),
@@ -193,9 +194,10 @@
193194
if (min === 0) { min = "0"; }
194195

195196
// use sane values for value, min & max
196-
value = parseDate(value) || now;
197-
min = parseDate(min || conf.yearRange[0] * 365);
198-
max = parseDate(max || conf.yearRange[1] * 365);
197+
value = parseDate(value) || now;
198+
199+
min = parseDate(min || new Date(yearNow + conf.yearRange[0], 1, 1));
200+
max = parseDate(max || new Date( yearNow + conf.yearRange[1]+ 1, 1, -1));
199201

200202

201203
// check that language exists

test/js/jquery-1.5.min.js

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/overlay/no-trigger.htm

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
2+
<script src="../js/jquery-1.5.min.js"></script>
3+
<script src="../../src/overlay/overlay.js"></script>
4+
5+
<link rel="stylesheet" type="text/css" href="style.css"/>
6+
7+
8+
<div class="overlay" id="overlay">
9+
10+
<div class="content" style="background-image:url(../img/6481762_3d2c7e79f7.jpg)">
11+
asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj
12+
</div>
13+
14+
</div>
15+
16+
17+
<script>
18+
var api = $("#overlay").overlay().data("overlay");
19+
20+
api.load();
21+
</script>

0 commit comments

Comments
 (0)