Skip to content

Commit 2887934

Browse files
author
bradrobertson
committed
fix for dynamic tooltip for issue/437
updating other test files to use jquery 1.6.2
1 parent 64ce3a6 commit 2887934

12 files changed

+36
-25
lines changed

src/tooltip/tooltip.dynamic.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@
6565

6666
conf = $.extend({}, t.dynamic.conf, conf);
6767

68-
var cls = conf.classNames.split(/\s/), orig;
68+
var confOrigin = $.extend(true,{},conf),
69+
cls = conf.classNames.split(/\s/),
70+
orig;
6971

7072
this.each(function() {
7173

@@ -102,8 +104,10 @@
102104
left: pos.left
103105
}).show();
104106

105-
// now let's see for hidden edges
106-
var crop = getCropping(tip);
107+
var conf = $.extend(true,{},confOrigin),
108+
109+
// now let's see for hidden edges
110+
crop = getCropping(tip);
107111

108112
// possibly alter the configuration
109113
if (!isVisible(crop)) {

test/tooltip/click.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
<!DOCTYPE html>
12

2-
<script src="../../../jquery-1.6.2.js"></script>
3-
<script src="../tools.tooltip.js"></script>
3+
<script src="../js/jquery-1.6.2.min.js"></script>
4+
<script src="../../src/tooltip/tooltip.js"></script>
45
<link rel="stylesheet" type="text/css" href="style.css"/>
56

67

test/tooltip/dynamic.html

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1+
<!DOCTYPE html>
12

2-
<script src="../../../jquery-1.6.2.js"></script>
3-
<script src="../tools.tooltip.js"></script>
4-
<script src="../tools.tooltip.dynamic.js"></script>
3+
<script src="../js/jquery-1.6.2.min.js"></script>
4+
<script src="../../src/tooltip/tooltip.js"></script>
5+
<script src="../../src/tooltip/tooltip.dynamic.js"></script>
56

6-
<style>
7+
<style type="text/css">
78
body {
89
padding:30px;
910
}
1011

1112
div.tip {
12-
background:transparent url(../../../../www/trunk/web/tools/img/tooltip/black.png) 0 0 no-repeat;
13+
background:#000 url(../../../../www/trunk/web/tools/img/tooltip/black.png) 0 0 no-repeat;
1314
display:none;
1415
width:165px;
1516
height:63px;
@@ -74,6 +75,8 @@
7475
});
7576
</script>
7677

78+
<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>
79+
7780
<table border="0" width="100%" height="100%">
7881
<tr>
7982
<td valign="top">

test/tooltip/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!DOCTYPE html>
12

23
<script src="../js/jquery-1.6.2.js"></script>
34
<script src="../../src/tooltip/tooltip.js"></script>

test/tooltip/many.html

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!DOCTYPE html>
12

23
<script src="../js/jquery-1.6.2.js"></script>
34
<script src="../../src/tooltip/tooltip.js"></script>

test/validator/dateinputs.htm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
21
<!DOCTYPE html>
3-
<script src="../js/jquery-1.4.2.min.js"></script>
2+
3+
<script src="../js/jquery-1.6.2.min.js"></script>
44
<script src="../../src/validator/validator.js"></script>
55
<script src="../../src/dateinput/dateinput.js"></script>
66

test/validator/minimal.htm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html>
22

3-
<script src="../js/jquery-1.5.min.js"></script>
3+
<script src="../js/jquery-1.6.2.min.js"></script>
44
<script src="../../src/validator/validator.js"></script>
55

66
<style>
@@ -65,7 +65,7 @@
6565
</select>
6666
</label>
6767

68-
<!-- <button>Submit</button> -->
68+
<button type="submit">Submit</button>
6969

7070
</form>
7171

test/validator/no-form.htm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<script src="../js/jquery-1.4.2.min.js"></script>
2+
<script src="../js/jquery-1.6.2.min.js"></script>
33
<script src="../../src/validator/validator.js"></script>
44

55
<style>

test/validator/onsubmit.htm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
21
<!DOCTYPE html>
3-
<script src="../js/jquery-1.4.2.min.js"></script>
2+
3+
<script src="../js/jquery-1.6.2.min.js"></script>
44
<script src="../../src/validator/validator.js"></script>
55

66
<form action="#" style="margin:100px">

test/validator/radio.htm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
21
<!DOCTYPE html>
3-
<script src="../js/jquery-1.4.2.min.js"></script>
2+
3+
<script src="../js/jquery-1.6.2.min.js"></script>
44
<script src="../../src/validator/validator.js"></script>
55

66
<style>

test/validator/submit_manually.htm

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!DOCTYPE html>
2-
<script src="../js/jquery-1.4.2.min.js"></script>
2+
3+
<script src="../js/jquery-1.6.2.min.js"></script>
34
<script src="../../src/validator/validator.js"></script>
45

56
<form action="http://google.com/search" style="margin:100px">
@@ -14,8 +15,9 @@
1415

1516
<script>
1617
$("form").validator({ position: 'top center'});
17-
$("a.submit").click(function(event) {
18-
event.preventDefault();
18+
19+
$("a.submit").click(function(e) {
20+
e.preventDefault();
1921
$("form:first").submit();
2022
});
2123
</script>

test/validator/validator.htm

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
21
<!DOCTYPE html>
2+
33
<script src="../js/jquery-1.6.2.min.js"></script>
44
<script src="../../src/validator/validator.js"></script>
55
<script src="../../src/dateinput/dateinput.js"></script>
@@ -28,8 +28,7 @@
2828
<form action="#">
2929

3030
<p>
31-
abc, required <input type="text" pattern="\d+" name="abc"
32-
/>
31+
abc, required <input type="text" pattern="\d+" name="abc" />
3332
</p>
3433
<p>
3534
date <input type="date" title="Use format yyyy-mm-dd" name="day" min="-40" required="true" />

0 commit comments

Comments
 (0)