Skip to content

Commit 29a0e14

Browse files
author
bradrobertson
committed
fix setting val() on clone, when undefined, will clear out value in latest jquery
1 parent adc6cac commit 29a0e14

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

src/dateinput/dateinput.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
val = integer(val);
165165
}
166166

167-
var date = new Date();
167+
var date = new Date;
168168
date.setDate(date.getDate() + val);
169169
return date;
170170
}
@@ -176,7 +176,7 @@
176176

177177
// variables
178178
var self = this,
179-
now = new Date(),
179+
now = new Date,
180180
yearNow = now.getFullYear(),
181181
css = conf.css,
182182
labels = LABELS[conf.lang],
@@ -207,13 +207,15 @@
207207
// Replace built-in date input: NOTE: input.attr("type", "text") throws exception by the browser
208208
if (input.attr("type") == 'date') {
209209
var original = input.clone(),
210-
def = original.wrap("<div/>").parent().html(),
211-
clone = $(def.replace(/type/i, "type=text data-orig-type"));
212-
213-
clone.val(conf.value);
210+
def = original.wrap("<div/>").parent().html(),
211+
clone = $(def.replace(/type/i, "type=text data-orig-type"));
212+
213+
if (conf.value) clone.val(conf.value); // jquery 1.6.2 val(undefined) will clear val()
214+
214215
input.replaceWith(clone);
215216
input = clone;
216217
}
218+
217219
input.addClass(css.input);
218220

219221
var fire = input.add(self);
@@ -732,7 +734,7 @@
732734
}
733735

734736
// initial value
735-
if (parseDate(input.val())) {
737+
if (parseDate(input.val())) {
736738
select(value, conf);
737739
}
738740

test/dateinput/customized.htm

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
<script src="../js/jquery-1.4.2.js"></script>
2+
<script src="../js/jquery-1.6.2.js"></script>
33
<script src="../../src/dateinput/dateinput.js"></script>
44

55
<link rel="stylesheet" type="text/css" href="skin1.css"/>
@@ -10,6 +10,12 @@
1010

1111
<input type="date" name="mydate" data-value="1967-05-30" />
1212

13+
<input type="date" name="date1" value="Today" />
14+
15+
<input type="date" name="date2" value="5 days from now" min="2010-03-01" max="2012-01-01" />
16+
17+
<input type="date" name="date3" value="15" min="-25" max="25" data-value="15"/>
18+
1319
<!-- make it happen -->
1420
<script>
1521
var begdat = new Date(1980,1,1);
@@ -28,6 +34,16 @@
2834
trigger: true,
2935
toggle: true
3036
});
37+
38+
$(":date:eq(2), :date:eq(3), :date:eq(4)").dateinput({
39+
format: 'dddd dd, mmmm yyyy', // the format displayed for the user
40+
selectors: true, // whether month/year dropdowns are shown
41+
min: -100, // min selectable day (100 days backwards)
42+
max: 100, // max selectable day (100 days onwards)
43+
offset: [10, 20], // tweak the position of the calendar
44+
speed: 'fast', // calendar reveal speed
45+
firstDay: 1 // which day starts a week. 0 = sunday, 1 = monday etc..
46+
});
3147
</script>
3248

3349

0 commit comments

Comments
 (0)