Permalink
Browse files

Merge branch 'master' into zdennis/master

  • Loading branch information...
2 parents c447d0a + bff04b7 commit b06be6dee7ac8add51f32107125546faa59be29e @kemayo committed May 22, 2010
Showing with 181 additions and 25 deletions.
  1. +20 −8 docs/demo_simple.html
  2. +1 −1 docs/demo_usa.html
  3. +1 −1 docs/demo_world.html
  4. +5 −4 docs/index.html
  5. +0 −11 docs/jquery-1.2.3.pack.js
  6. +154 −0 docs/jquery-1.4.2.min.js
View
@@ -2,13 +2,7 @@
"http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
- <title>jQuery maphilight documentation</title>
- <script type="text/javascript" src="jquery-1.2.3.pack.js"></script>
- <script type="text/javascript" src="jquery.metadata.min.js"></script>
- <script type="text/javascript" src="../jquery.maphilight.min.js"></script>
- <script>$(function() {
- $('.map').maphilight();
- });</script>
+ <title>jQuery maphilight documentation</title>
</head>
<body>
<h1>A small map</h1>
@@ -18,10 +12,28 @@
<map name="simple">
<area href="#" shape="poly" coords="47,62, 106,61, 134,72, 135,118, 30,116" title="Default behavior"></area>
<area href="#" shape="poly" coords="32,157, 133,157, 127,192, 127,211, 28,211" class="{strokeColor:'0000ff',strokeWidth:5,fillColor:'ff0000',fillOpacity:0.6}" title="Metadata'd up a bit"></area>
-<area href="#" shape="circ" coords="290,102,30" class="{stroke:false,fillColor:'ff0000',fillOpacity:0.6}" title="Metadata'd up a bit"></area>
+<area id="squidhead" href="#" shape="circ" coords="290,102,30" class="{stroke:false,fillColor:'ff0000',fillOpacity:0.6}" title="Metadata'd up a bit"></area>
<area href="#" shape="poly" coords="219,190, 225,175, 237,157, 239,148, 245,142, 251,140, 263,140, 265,139, 310,139, 311,145, 364,182, 363,201, 343,221, 333,213, 329,181, 313,177, 330,234, 295,231, 292,174, 279,176, 282,204, 269,220, 255,206, 267,167, 235,193" class="{stroke:false,fillColor:'000000',fillOpacity:1,alwaysOn:true}" title="Metadata'd up a bit"></area>
</map>
</p>
+<p>Because it's a really common question: <a id="squidheadlink" href="#">mouse over this to trigger a hilight from an external element!</a></p>
+<p>The code involved is very simple:</p>
+<code><pre>$('#squidheadlink').mouseover(function(e) {
+ $('#squidhead').mouseover();
+}).mouseout(function(e) {
+ $('#squidhead').mouseout();
+}).click(function(e) { e.preventDefault(); });</code></pre>
<a href="./">Back to the index</a>
+<script type="text/javascript" src="jquery-1.4.2.min.js"></script>
+ <script type="text/javascript" src="jquery.metadata.min.js"></script>
+ <script type="text/javascript" src="../jquery.maphilight.min.js"></script>
+ <script>$(function() {
+ $('.map').maphilight();
+ $('#squidheadlink').mouseover(function(e) {
+ $('#squidhead').mouseover();
+ }).mouseout(function(e) {
+ $('#squidhead').mouseout();
+ }).click(function(e) { e.preventDefault(); });
+ });</script>
</body>
</html>
View
2 docs/demo_usa.html 100644 → 100755
@@ -3,7 +3,7 @@
<html>
<head>
<title>jQuery maphilight documentation</title>
- <script type="text/javascript" src="jquery-1.2.3.pack.js"></script>
+ <script type="text/javascript" src="jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="../jquery.maphilight.min.js"></script>
<script>$(function() {
$('.map').maphilight();
View
@@ -3,7 +3,7 @@
<html>
<head>
<title>jQuery maphilight documentation</title>
- <script type="text/javascript" src="jquery-1.2.3.pack.js"></script>
+ <script type="text/javascript" src="jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="../jquery.maphilight.min.js"></script>
<script>$(function() {
$('.map').maphilight({fade: false});
View
@@ -3,7 +3,7 @@
<html>
<head>
<title>jQuery maphilight documentation</title>
- <script type="text/javascript" src="jquery-1.2.3.pack.js"></script>
+ <script type="text/javascript" src="jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="ui.tabs.pack.js"></script>
<link rel="stylesheet" type="text/css" href="ui.tabs.css" />
<style type="text/css">
@@ -151,14 +151,15 @@
<h2>Tested with</h2>
<ul>
<li>Firefox 2, 3</li>
- <li>IE 6, 7</li>
- <li>Safari 3</li>
- <li>Opera 9</li>
+ <li>IE 6, 7, 8</li>
+ <li>Safari 3, 4</li>
+ <li>Opera 9, 10</li>
</ul>
<h2>Contributors</h2>
These people have contributed in some way to the project:
<ul>
<li>Billy Earney (@ University of Missouri): fixed alwaysOn for IE</li>
+ <li>Travis Balzarini (@ Sonoma County Web Team): fixed IE 8
</ul>
</body>
</html>
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit b06be6d

Please sign in to comment.