Permalink
Browse files

fix apple overlay bug in firefox 3.6

  • Loading branch information...
1 parent 4e580aa commit 5f5eb0f75e1e44a2b62de648a3ba92bcf8cd5720 @bradrobertson bradrobertson committed Oct 31, 2011
Showing with 105 additions and 60 deletions.
  1. +3 −2 CHANGELOG.md
  2. +2 −2 src/overlay/overlay.apple.js
  3. +40 −0 test/overlay/apple.html
  4. +60 −53 test/tabs/history.htm
  5. +0 −3 test/tabs/slideshow.htm
View
@@ -1,8 +1,9 @@
# 1.2.7
### In Progress
- - Fix dateinput selectors bug
- -
+ - Fix dateinput selectors bug[#541](https://github.com/jquerytools/jquerytools/issues/541)
+ - Fix history bug in scrollable navigator[#542](https://github.com/jquerytools/jquerytools/issues/542)
+ - Fix apple effect on firefox 3.6 [#310](https://github.com/jquerytools/jquerytools/issues/310)
# 1.2.6
### Sept 15, 2011
@@ -99,8 +99,8 @@
// begin growing
img.animate({
- top: overlay.css("top"),
- left: overlay.css("left"),
+ top: pos.top,
+ left: pos.left,
width: oWidth}, conf.speed, function() {
// set close button and content over the image
View
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+
+<html>
+ <head>
+ <script src="../js/jquery-1.6.2.js"></script>
+ <script src="../../src/overlay/overlay.js"></script>
+ <script src="../../src/overlay/overlay.apple.js"></script>
+
+ <link rel="stylesheet" type="text/css" href="style.css"/>
+ </head>
+
+ <body>
+
+ <p>
+ <a rel="#overlay2" href="#">show overlay</a>
+ </p>
+
+ <div class="overlay" id="overlay2">
+
+ <div style="padding:40px">
+ asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj
+ </div>
+
+ </div>
+
+ <script>
+ $("a[rel]").overlay({
+ closeOnClick: false,
+
+ mask: {
+ color: '#ccc',
+ closeSpeed: 200
+ },
+
+ effect: 'apple'
+ });
+ </script>
+
+ </body>
+</html>
View
@@ -1,65 +1,72 @@
+<!DOCTYPE html>
-<script src="../js/jquery-1.6.2.js"></script>
-<script src="../../src/tabs/tabs.js"></script>
-<script src="../../src/toolbox/toolbox.history.js"></script>
+<html>
+ <head>
+ <script src="../js/jquery-1.6.2.js"></script>
+ <script src="../../src/tabs/tabs.js"></script>
+ <script src="../../src/toolbox/toolbox.history.js"></script>
-<link rel="stylesheet" type="text/css" href="css/tabs.css"/>
-
-<!-- tabs -->
-<ul class="tabs">
- <li><a id="t1" href="#player_tab">The Player</a></li>
- <li><a id="t2" href="#plugins_tab">Plugins</a></li>
- <li><a id="t3" href="#streaming_tab">Streaming</a></li>
- <li><a id="t4" href="#scripting_tab">Scripting</a></li>
-</ul>
+ <link rel="stylesheet" type="text/css" href="css/tabs.css"/>
+ </head>
+
+ <body>
+ <!-- tabs -->
+ <ul class="tabs">
+ <li><a id="t1" href="#player_tab">The Player</a></li>
+ <li><a id="t2" href="#plugins_tab">Plugins</a></li>
+ <li><a id="t3" href="#streaming_tab">Streaming</a></li>
+ <li><a id="t4" href="#scripting_tab">Scripting</a></li>
+ </ul>
-<!-- panes -->
-<div class="panes">
+ <!-- panes -->
+ <div class="panes">
- <div class="pane" style="display:block">
- <p>
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis viverra, leo sit amet auctor fermentum, risus lorem posuere tortor, in accumsan purus magna imperdiet sem.
- </p>
+ <div class="pane" style="display:block">
+ <p>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis viverra, leo sit amet auctor fermentum, risus lorem posuere tortor, in accumsan purus magna imperdiet sem.
+ </p>
- <p>
- Suspendisse enim. Pellentesque facilisis aliquam enim. Maecenas facilisis molestie lectus. Sed ornare ultricies tortor. Vivamus nibh metus, faucibus quis, semper ut, dignissim id, diam.
- </p>
- </div>
+ <p>
+ Suspendisse enim. Pellentesque facilisis aliquam enim. Maecenas facilisis molestie lectus. Sed ornare ultricies tortor. Vivamus nibh metus, faucibus quis, semper ut, dignissim id, diam.
+ </p>
+ </div>
- <div class="pane">
- <p>
- Mauris ultricies. Nam feugiat egestas nulla. Donec augue dui, molestie sed, tristique sit amet, blandit eu, turpis. Mauris hendrerit, nisi et sodales tempor, orci tellus laoreet elit, sed molestie dui quam vitae dui.
- </p>
- <p>
- Pellentesque nisl. Ut adipiscing vehicula risus. Nam eget tortor. Maecenas id augue. Vivamus interdum nulla ac dolor. Fusce metus. Suspendisse eu purus. Maecenas quis lacus eget dui volutpat molestie.
- </p>
- </div>
+ <div class="pane">
+ <p>
+ Mauris ultricies. Nam feugiat egestas nulla. Donec augue dui, molestie sed, tristique sit amet, blandit eu, turpis. Mauris hendrerit, nisi et sodales tempor, orci tellus laoreet elit, sed molestie dui quam vitae dui.
+ </p>
+ <p>
+ Pellentesque nisl. Ut adipiscing vehicula risus. Nam eget tortor. Maecenas id augue. Vivamus interdum nulla ac dolor. Fusce metus. Suspendisse eu purus. Maecenas quis lacus eget dui volutpat molestie.
+ </p>
+ </div>
- <div class="pane">
- <p>
- Maecenas at odio. Nunc laoreet lectus vel ante. Nullam imperdiet. Sed justo dolor, mattis eu, euismod sed, tempus a, nisl. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
- </p>
+ <div class="pane">
+ <p>
+ Maecenas at odio. Nunc laoreet lectus vel ante. Nullam imperdiet. Sed justo dolor, mattis eu, euismod sed, tempus a, nisl. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
+ </p>
- <p>
- In sed dolor. Etiam eget quam ac nibh pharetra adipiscing. Nullam vitae ligula. Sed sit amet leo sit amet arcu mollis ultrices. Vivamus rhoncus sapien nec lorem. In mattis nisi. Vivamus at enim. Integer semper imperdiet massa. Vestibulum nulla massa, pretium quis, porta id, vestibulum vitae, velit.
- </p>
- </div>
+ <p>
+ In sed dolor. Etiam eget quam ac nibh pharetra adipiscing. Nullam vitae ligula. Sed sit amet leo sit amet arcu mollis ultrices. Vivamus rhoncus sapien nec lorem. In mattis nisi. Vivamus at enim. Integer semper imperdiet massa. Vestibulum nulla massa, pretium quis, porta id, vestibulum vitae, velit.
+ </p>
+ </div>
- <div class="pane">
- <p>Another Tab</p>
- <p>
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis viverra, leo sit amet auctor fermentum, risus lorem posuere tortor, in accumsan purus magna imperdiet sem.
- </p>
+ <div class="pane">
+ <p>Another Tab</p>
+ <p>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis viverra, leo sit amet auctor fermentum, risus lorem posuere tortor, in accumsan purus magna imperdiet sem.
+ </p>
- <p>
- Suspendisse enim. Pellentesque facilisis aliquam enim. Maecenas facilisis molestie lectus. Sed ornare ultricies tortor. Vivamus nibh metus, faucibus quis, semper ut, dignissim id, diam.
- </p>
- </div>
-</div>
+ <p>
+ Suspendisse enim. Pellentesque facilisis aliquam enim. Maecenas facilisis molestie lectus. Sed ornare ultricies tortor. Vivamus nibh metus, faucibus quis, semper ut, dignissim id, diam.
+ </p>
+ </div>
+ </div>
-<script>
-$(function() {
- $(".tabs").tabs(".pane", { history: true });
-});
-</script>
+ <script>
+ $(function() {
+ $(".tabs").tabs(".pane", { history: true });
+ });
+ </script>
+ </body>
+</html>
View
@@ -1,6 +1,3 @@
-
-
-
<!DOCTYPE html>
<html>

0 comments on commit 5f5eb0f

Please sign in to comment.