E847 - removed 1.6 branch · ainformatico/jquery-ui@4e06fa6 · GitHub
Skip to content

Commit 4e06fa6

Browse files
author
Paul Bakaus
committed
- removed 1.6 branch
- changed version in tags/1.5.2 to 1.5.2 - merged trunk with 1.6
1 parent cf48fc7 commit 4e06fa6

17 files changed

Lines changed: 2049 additions & 42 deletions

‎tests/autocomplete.html‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2+
<html>
3+
<head>
4+
5+
<link rel="stylesheet" href="qunit/testsuite.css" type="text/css" media="screen">
6+
7+
<script type="text/javascript" src="../jquery-1.2.6.js"></script>
8+
<script type="text/javascript" src="../ui/ui.core.js"></script>
9+
<script type="text/javascript" src="../ui/ui.autocomplete.js"></script>
10+
11+
<script type="text/javascript" src="qunit/testrunner.js"></script>
12+
<script type="text/javascript" src="simulate/jquery.simulate.js"></script>
13+
14+
<script type="text/javascript" src="autocomplete.js"></script>
15+
16+
</head>
17+
18+
<body>
19+
<h1>jQuery - Autocomplete Test Suite</h1>
20+
<div id="main" style="display: none">
21+
22+
</div>
23+
24+
<ol id="tests"></ol>
25+
</body>
26+
27+
</html>

‎tests/autocomplete.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
test("highlighter", function() {
2+
equals( jQuery.Autocompleter.defaults.highlight("Peter", "Pe"), "<strong>Pe</strong>ter" );
3+
equals( jQuery.Autocompleter.defaults.highlight("Peter <em>&lt;Pan&gt;</em>", "Pe"), "<strong>Pe</strong>ter <em>&lt;Pan&gt;</em>" );
4+
equals( jQuery.Autocompleter.defaults.highlight("Peter <em>&lt;Pan&gt;</em>", "a"), "Peter <em>&lt;P<strong>a</strong>n&gt;</em>" );
5+
equals( jQuery.Autocompleter.defaults.highlight("Peter <em>(&lt;Pan&gt;)</em>", "(&lt;P"), "Peter <em><strong>(&lt;P</strong>an&gt;)</em>" );
6+
});

‎tests/images/bg.gif‎

1.07 KB
Loading

‎tests/images/clock.png‎

24 KB
Loading

‎tests/images/progress-bg.gif‎

834 Bytes
Loading

‎tests/visual/magnifier.html‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4+
<head>
5+
<meta http-equiv="Content-Language" content="en" />
6+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
7+
<title>Magnifier Demo</title>
8+
9+
<style type="text/css">
10+
11+
body,html {
12+
margin: 0;
13+
padding: 0;
14+
font-family: Arial;
15+
font-size: 12px;
16+
}
17+
18+
div.playground {
19+
height: 150px;
20+
}
21+
22+
#example1 img,
23+
#example2 img,
24+
#example3 img,
25+
#example4 img {
26+
float:left;
27+
}
28+
29+
</style>
30+
<script type="text/javascript" src="../../jquery-1.2.6.js"></script>
31+
<script type="text/javascript" src="../../ui/ui.core.js"></script>
32+
<script type="text/javascript" src="../../ui/ui.magnifier.js"></script>
33+
34+
35+
</head>
36+
<body>
37+
38+
<h2>1. Default, no options</h2>
39+
<div class="playground">
40+
<div id='example1' class="ui-wrapper example" style="width: 580px; padding: 20px;">
41+
<img src="../images/clock.png" width="48" alt="" />
42+
<img src="../images/clock.png" width="48" alt="" />
43+
<img src="../images/clock.png" width="48" alt="" />
44+
<img src="../images/clock.png" width="48" alt="" />
45+
<img src="../images/clock.png" width="48" alt="" />
46+
<img src="../images/clock.png" width="48" alt="" />
47+
</div>
48+
</div>
49+
50+
<h2>2. Magnification set to 1.5 (default: 2)</h2>
51+
<div class="playground">
52+
<div id='example2' class="ui-wrapper example" style="width: 580px; padding: 20px;">
53+
<img src="../images/clock.png" width="48" alt="" />
54+
<img src="../images/clock.png" width="48" alt="" />
55+
<img src="../images/clock.png" width="48" alt="" />
56+
<img src="../images/clock.png" width="48" alt="" />
57+
<img src="../images/clock.png" width="48" alt="" />
58+
<img src="../images/clock.png" width="48" alt="" />
59+
</div>
60+
</div>
61+
62+
<h2>3. Advanced example: overlap: true, zIndex: 10, opacity: { min: 0.6, max: 1 }, baseline: -1</h2>
63+
<div class="playground">
64+
<div id='example3' class="ui-wrapper example" style="width: 580px; padding: 20px;">
65+
<img src="../images/clock.png" width="48" alt="" />
66+
<img src="../images/clock.png" width="48" alt="" />
67+
<img src="../images/clock.png" width="48" alt="" />
68+
<img src="../images/clock.png" width="48" alt="" />
69+
<img src="../images/clock.png" width="48" alt="" />
70+
<img src="../images/clock.png" width="48" alt="" />
71+
</div>
72+
</div>
73+
74+
<h2>4. Advanced example: The direction doesn't have to be horizontal!</h2>
75+
<div class="playground">
76+
<div id='example4' class="ui-wrapper example" style="width: 150px; padding: 20px; height: 150px;">
77+
<img src="../images/clock.png" width="48" alt="" />
78+
<img src="../images/clock.png" width="48" alt="" />
79+
<img src="../images/clock.png" width="48" alt="" />
80+
<img src="../images/clock.png" width="48" alt="" />
81+
<img src="../images/clock.png" width="48" alt="" />
82+
<img src="../images/clock.png" width="48" alt="" />
83+
<img src="../images/clock.png" width="48" alt="" />
84+
<img src="../images/clock.png" width="48" alt="" />
85+
<img src="../images/clock.png" width="48" alt="" />
86+
</div>
87+
</div>
88+
89+
<script type="text/javascript">
90+
if(!window.console) {
91+
window.console = {
92+
log: function() {
93+
alert(arguments[0]);
94+
}
95+
}
96+
}
97+
98+
$(window).bind("load",function(){
99+
100+
$('#example1').magnifier();
101+
$('#example2').magnifier({ magnification: 1.5 });
102+
$('#example3').magnifier({ magnification: 1.5, overlap: true, zIndex: 10, opacity: { min: 0.6, max: 1 }, baseline: -1 });
103+
$('#example4').magnifier({ magnification: 1.5, overlap: true, zIndex: 10, opacity: { min: 0.6, max: 1 }, distance: 30 });
104+
105+
});
106+
</script>
107+
</body>
108+
</html>

0 commit comments

Comments
 (0)