Skip to content

Commit

Permalink
- removed 1.6 branch
Browse files Browse the repository at this point in the history 
- changed version in tags/1.5.2 to 1.5.2
- merged trunk with 1.6
  • Loading branch information
Paul Bakaus committed Jul 9, 2008
1 parent cf48fc7 commit 4e06fa6
Show file tree
Hide file tree
Showing 17 changed files with 2,049 additions and 42 deletions.
27 changes: 27 additions & 0 deletions tests/autocomplete.html
View file
@@ -0,0 +1,27 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>

<link rel="stylesheet" href="qunit/testsuite.css" type="text/css" media="screen">

<script type="text/javascript" src="../jquery-1.2.6.js"></script>
<script type="text/javascript" src="../ui/ui.core.js"></script>
<script type="text/javascript" src="../ui/ui.autocomplete.js"></script>

<script type="text/javascript" src="qunit/testrunner.js"></script>
<script type="text/javascript" src="simulate/jquery.simulate.js"></script>

<script type="text/javascript" src="autocomplete.js"></script>

</head>

<body>
<h1>jQuery - Autocomplete Test Suite</h1>
<div id="main" style="display: none">

</div>

<ol id="tests"></ol>
</body>

</html>
6 changes: 6 additions & 0 deletions tests/autocomplete.js
View file
@@ -0,0 +1,6 @@
test("highlighter", function() {
equals( jQuery.Autocompleter.defaults.highlight("Peter", "Pe"), "<strong>Pe</strong>ter" );
equals( jQuery.Autocompleter.defaults.highlight("Peter <em>&lt;Pan&gt;</em>", "Pe"), "<strong>Pe</strong>ter <em>&lt;Pan&gt;</em>" );
equals( jQuery.Autocompleter.defaults.highlight("Peter <em>&lt;Pan&gt;</em>", "a"), "Peter <em>&lt;P<strong>a</strong>n&gt;</em>" );
equals( jQuery.Autocompleter.defaults.highlight("Peter <em>(&lt;Pan&gt;)</em>", "(&lt;P"), "Peter <em><strong>(&lt;P</strong>an&gt;)</em>" );
});
Binary file added tests/images/bg.gif
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/images/clock.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/images/progress-bg.gif
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
108 changes: 108 additions & 0 deletions tests/visual/magnifier.html
View file
@@ -0,0 +1,108 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Language" content="en" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Magnifier Demo</title>

<style type="text/css">

body,html {
margin: 0;
padding: 0;
font-family: Arial;
font-size: 12px;
}

div.playground {
height: 150px;
}

#example1 img,
#example2 img,
#example3 img,
#example4 img {
float:left;
}

</style>
<script type="text/javascript" src="../../jquery-1.2.6.js"></script>
<script type="text/javascript" src="../../ui/ui.core.js"></script>
<script type="text/javascript" src="../../ui/ui.magnifier.js"></script>


</head>
<body>

<h2>1. Default, no options</h2>
<div class="playground">
<div id='example1' class="ui-wrapper example" style="width: 580px; padding: 20px;">
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
</div>
</div>

<h2>2. Magnification set to 1.5 (default: 2)</h2>
<div class="playground">
<div id='example2' class="ui-wrapper example" style="width: 580px; padding: 20px;">
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
</div>
</div>

<h2>3. Advanced example: overlap: true, zIndex: 10, opacity: { min: 0.6, max: 1 }, baseline: -1</h2>
<div class="playground">
<div id='example3' class="ui-wrapper example" style="width: 580px; padding: 20px;">
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
</div>
</div>

<h2>4. Advanced example: The direction doesn't have to be horizontal!</h2>
<div class="playground">
<div id='example4' class="ui-wrapper example" style="width: 150px; padding: 20px; height: 150px;">
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
<img src="../images/clock.png" width="48" alt="" />
</div>
</div>

<script type="text/javascript">
if(!window.console) {
window.console = {
log: function() {
alert(arguments[0]);
}
}
}

$(window).bind("load",function(){

$('#example1').magnifier();
$('#example2').magnifier({ magnification: 1.5 });
$('#example3').magnifier({ magnification: 1.5, overlap: true, zIndex: 10, opacity: { min: 0.6, max: 1 }, baseline: -1 });
$('#example4').magnifier({ magnification: 1.5, overlap: true, zIndex: 10, opacity: { min: 0.6, max: 1 }, distance: 30 });

});
</script>
</body>
</html>

0 comments on commit 4e06fa6

Please sign in to comment.