Skip to content

Commit 6dcdb26

Browse files
committed
merging 1.2.6
1 parent d318a02 commit 6dcdb26

File tree

2 files changed

+73
-0
lines changed

2 files changed

+73
-0
lines changed

test/dateinput/trigger.htm

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
2+
<script src="../js/jquery-1.5.min.js"></script>
3+
<script src="../../src/dateinput/dateinput.js"></script>
4+
5+
<link rel="stylesheet" type="text/css" href="skin1.css"/>
6+
7+
<style>
8+
body {
9+
font-family:sans-serif;
10+
padding:100px;
11+
}
12+
13+
.caltrigger {
14+
display:block;
15+
width:22px;
16+
height:22px;
17+
float:left;
18+
background-color:blue;
19+
margin:6px 5px 0 0;
20+
}
21+
</style>
22+
23+
<!-- HTML5 date input -->
24+
<input type="date" name="mydate" />
25+
26+
<!-- make it happen -->
27+
<script>
28+
var api = $(":date").dateinput({ trigger: true, editable: true }).data("dateinput");
29+
30+
31+
api.destroy();
32+
33+
$(":date").dateinput();
34+
</script>
35+

test/overlay/another.htm

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
2+
<script src="../js/jquery-1.4.2.js"></script>
3+
<script src="../../src/core.js"></script>
4+
<script src="../../src/toolbox/toolbox.expose.js"></script>
5+
<script src="../../src/overlay/overlay.js"></script>
6+
7+
<link rel="stylesheet" type="text/css" href="style.css"/>
8+
9+
<p>
10+
<a rel="#overlay" href="#">show</a>
11+
</p>
12+
13+
14+
<div class="overlay" id="overlay">
15+
16+
<div class="content" style="background-image:url(../img/6481762_3d2c7e79f7.jpg)">
17+
asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj
18+
</div>
19+
20+
<a rel="#overlay2" href="#">show b</a>
21+
22+
</div>
23+
24+
<div class="overlay" id="overlay2">
25+
26+
<div style="padding:40px">
27+
asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj
28+
</div>
29+
30+
</div>
31+
32+
<script>
33+
$("a[rel]").overlay({
34+
closeOnClick: false,
35+
mask: '#ccc',
36+
oneInstance: false
37+
});
38+
</script>

0 commit comments

Comments
 (0)