Skip to content

Commit 5f5eb0f

Browse files
author
bradrobertson
committed
fix apple overlay bug in firefox 3.6
1 parent 4e580aa commit 5f5eb0f

File tree

5 files changed

+105
-60
lines changed

5 files changed

+105
-60
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# 1.2.7
22
### In Progress
33

4-
- Fix dateinput selectors bug
5-
-
4+
- Fix dateinput selectors bug[#541](https://github.com/jquerytools/jquerytools/issues/541)
5+
- Fix history bug in scrollable navigator[#542](https://github.com/jquerytools/jquerytools/issues/542)
6+
- Fix apple effect on firefox 3.6 [#310](https://github.com/jquerytools/jquerytools/issues/310)
67

78
# 1.2.6
89
### Sept 15, 2011

‎src/overlay/overlay.apple.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999

100100
// begin growing
101101
img.animate({
102-
top: overlay.css("top"),
103-
left: overlay.css("left"),
102+
top: pos.top,
103+
left: pos.left,
104104
width: oWidth}, conf.speed, function() {
105105

106106
// set close button and content over the image

‎test/overlay/apple.html‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<!DOCTYPE html>
2+
3+
<html>
4+
<head>
5+
<script src="../js/jquery-1.6.2.js"></script>
6+
<script src="../../src/overlay/overlay.js"></script>
7+
<script src="../../src/overlay/overlay.apple.js"></script>
8+
9+
<link rel="stylesheet" type="text/css" href="style.css"/>
10+
</head>
11+
12+
<body>
13+
14+
<p>
15+
<a rel="#overlay2" href="#">show overlay</a>
16+
</p>
17+
18+
<div class="overlay" id="overlay2">
19+
20+
<div style="padding:40px">
21+
asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj asdfasdfsfadasd kasdj fjhasd fljkasd flkjasd flkasdj
22+
</div>
23+
24+
</div>
25+
26+
<script>
27+
$("a[rel]").overlay({
28+
closeOnClick: false,
29+
30+
mask: {
31+
color: '#ccc',
32+
closeSpeed: 200
33+
},
34+
35+
effect: 'apple'
36+
});
37+
</script>
38+
39+
</body>
40+
</html>

‎test/tabs/history.htm‎

Lines changed: 60 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,72 @@
1+
<!DOCTYPE html>
12

2-
<script src="../js/jquery-1.6.2.js"></script>
3-
<script src="../../src/tabs/tabs.js"></script>
4-
<script src="../../src/toolbox/toolbox.history.js"></script>
3+
<html>
4+
<head>
5+
<script src="../js/jquery-1.6.2.js"></script>
6+
<script src="../../src/tabs/tabs.js"></script>
7+
<script src="../../src/toolbox/toolbox.history.js"></script>
58

6-
<link rel="stylesheet" type="text/css" href="css/tabs.css"/>
7-
8-
<!-- tabs -->
9-
<ul class="tabs">
10-
<li><a id="t1" href="#player_tab">The Player</a></li>
11-
<li><a id="t2" href="#plugins_tab">Plugins</a></li>
12-
<li><a id="t3" href="#streaming_tab">Streaming</a></li>
13-
<li><a id="t4" href="#scripting_tab">Scripting</a></li>
14-
</ul>
9+
<link rel="stylesheet" type="text/css" href="css/tabs.css"/>
10+
</head>
11+
12+
<body>
13+
<!-- tabs -->
14+
<ul class="tabs">
15+
<li><a id="t1" href="#player_tab">The Player</a></li>
16+
<li><a id="t2" href="#plugins_tab">Plugins</a></li>
17+
<li><a id="t3" href="#streaming_tab">Streaming</a></li>
18+
<li><a id="t4" href="#scripting_tab">Scripting</a></li>
19+
</ul>
1520

16-
<!-- panes -->
17-
<div class="panes">
21+
<!-- panes -->
22+
<div class="panes">
1823

19-
<div class="pane" style="display:block">
20-
<p>
21-
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.
22-
</p>
24+
<div class="pane" style="display:block">
25+
<p>
26+
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.
27+
</p>
2328

24-
<p>
25-
Suspendisse enim. Pellentesque facilisis aliquam enim. Maecenas facilisis molestie lectus. Sed ornare ultricies tortor. Vivamus nibh metus, faucibus quis, semper ut, dignissim id, diam.
26-
</p>
27-
</div>
29+
<p>
30+
Suspendisse enim. Pellentesque facilisis aliquam enim. Maecenas facilisis molestie lectus. Sed ornare ultricies tortor. Vivamus nibh metus, faucibus quis, semper ut, dignissim id, diam.
31+
</p>
32+
</div>
2833

29-
<div class="pane">
30-
<p>
31-
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.
32-
</p>
33-
<p>
34-
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.
35-
</p>
36-
</div>
34+
<div class="pane">
35+
<p>
36+
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.
37+
</p>
38+
<p>
39+
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.
40+
</p>
41+
</div>
3742

38-
<div class="pane">
39-
<p>
40-
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.
41-
</p>
43+
<div class="pane">
44+
<p>
45+
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.
46+
</p>
4247

43-
<p>
44-
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.
45-
</p>
46-
</div>
48+
<p>
49+
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.
50+
</p>
51+
</div>
4752

48-
<div class="pane">
49-
<p>Another Tab</p>
50-
<p>
51-
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.
52-
</p>
53+
<div class="pane">
54+
<p>Another Tab</p>
55+
<p>
56+
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.
57+
</p>
5358

54-
<p>
55-
Suspendisse enim. Pellentesque facilisis aliquam enim. Maecenas facilisis molestie lectus. Sed ornare ultricies tortor. Vivamus nibh metus, faucibus quis, semper ut, dignissim id, diam.
56-
</p>
57-
</div>
58-
</div>
59+
<p>
60+
Suspendisse enim. Pellentesque facilisis aliquam enim. Maecenas facilisis molestie lectus. Sed ornare ultricies tortor. Vivamus nibh metus, faucibus quis, semper ut, dignissim id, diam.
61+
</p>
62+
</div>
63+
</div>
5964

6065

61-
<script>
62-
$(function() {
63-
$(".tabs").tabs(".pane", { history: true });
64-
});
65-
</script>
66+
<script>
67+
$(function() {
68+
$(".tabs").tabs(".pane", { history: true });
69+
});
70+
</script>
71+
</body>
72+
</html>

‎test/tabs/slideshow.htm‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
2-
3-
41
<!DOCTYPE html>
52

63
<html>

0 commit comments

Comments
 (0)