Skip to content

Commit f502230

Browse files
committed
fix issue 261 where history event was not being triggered properly
1 parent e4b0a83 commit f502230

File tree

2 files changed

+56
-2
lines changed

2 files changed

+56
-2
lines changed

src/toolbox/toolbox.history.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
h = idoc.location.hash;
3535

3636
if (hash !== h) {
37-
$.event.trigger("hash", h);
37+
$(window).trigger("hash", h);
3838
}
3939
}, 100);
4040

@@ -47,7 +47,7 @@
4747
setInterval(function() {
4848
var h = location.hash;
4949
if (h !== hash) {
50-
$.event.trigger("hash", h);
50+
$(window).trigger("hash", h);
5151
}
5252
}, 100);
5353
}

test/tabs/history.htm

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
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>
5+
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>
15+
16+
<!-- panes -->
17+
<div class="panes">
18+
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>
23+
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>
28+
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>
37+
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>
42+
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>
47+
</div>
48+
49+
50+
<script>
51+
$(function() {
52+
$(".tabs").tabs(".pane", { history: true });
53+
});
54+
</script>

0 commit comments

Comments
 (0)