Skip to content

Commit fa13c4a

Browse files
scottgonzalezscottgonzalez
committed
Merge branch 'tabs_1.9' of https://github.com/petersendidit/jquery-ui into petersendidit-tabs
2 parents cd29170 + e9ae04a commit fa13c4a

13 files changed

+1359
-751
lines changed

‎demos/tabs/ajax.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
$( "#tabs" ).tabs({
1515
ajaxOptions: {
1616
error: function( xhr, status, index, anchor ) {
17-
$( anchor.hash ).html(
17+
var selector = $( anchor ).attr( "aria-controls" );
18+
$( selector ).html(
1819
"Couldn't load this tab. We'll try to fix this as soon as possible. " +
1920
"If this wouldn't be a demo." );
2021
}

‎tests/unit/tabs/tabs.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<link type="text/css" href="../../../themes/base/jquery.ui.tabs.css" rel="stylesheet" />
88

99
<script type="text/javascript" src="../../../jquery-1.5.1.js"></script>
10+
<script>
11+
$.uiBackCompat = false;
12+
</script>
1013
<script type="text/javascript" src="../../../external/jquery.cookie.js"></script>
1114
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
1215
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>

‎tests/unit/tabs/tabs_core.js

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,34 +25,4 @@ test('navigation markup', function() {
2525
el.tabs('destroy');
2626
});
2727

28-
test('ajax', function() {
29-
expect(4);
30-
stop();
31-
32-
el = $('#tabs2');
33-
34-
el.tabs({
35-
selected: 2,
36-
load: function() {
37-
// spinner: default spinner
38-
setTimeout(function() {
39-
equals($('li:eq(2) > a > span', el).length, 1, "should restore tab markup after spinner is removed");
40-
equals($('li:eq(2) > a > span', el).html(), '3', "should restore tab label after spinner is removed");
41-
el.tabs('destroy');
42-
el.tabs({
43-
selected: 2,
44-
spinner: '<img src="spinner.gif" alt="">',
45-
load: function() {
46-
// spinner: image
47-
equals($('li:eq(2) > a > span', el).length, 1, "should restore tab markup after spinner is removed");
48-
equals($('li:eq(2) > a > span', el).html(), '3', "should restore tab label after spinner is removed");
49-
start();
50-
}
51-
});
52-
}, 1);
53-
}
54-
});
55-
56-
});
57-
5828
})(jQuery);

‎tests/unit/tabs/tabs_defaults.js

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,14 @@
33
*/
44

55
var tabs_defaults = {
6-
add: null,
7-
ajaxOptions: null,
8-
cache: false,
6+
activate: null,
7+
beforeload: null,
8+
beforeActivate: null,
99
collapsible: false,
10-
cookie: null,
11-
disable: null,
1210
disabled: false,
13-
enable: null,
1411
event: "click",
1512
fx: null,
16-
idPrefix: "ui-tabs-",
17-
load: null,
18-
panelTemplate: "<div></div>",
19-
remove: null,
20-
select: null,
21-
show: null,
22-
spinner: "<em>Loading&#8230;</em>",
23-
tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>"
13+
load: null
2414
};
2515

2616
// FAIL: falsy values break the cookie option

‎tests/unit/tabs/tabs_defaults_deprecated.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* tabs_defaults.js
3+
*/
4+
5+
var tabs_defaults = {
6+
activate: null,
7+
add: null,
8+
ajaxOptions: null,
9+
beforeload: null,
10+
beforeActivate: null,
11+
cache: false,
12+
collapsible: false,
13+
cookie: null,
14+
disable: null,
15+
disabled: false,
16+
enable: null,
17+
event: "click",
18+
fx: null,
19+
idPrefix: "ui-tabs-",
20+
load: null,
21+
panelTemplate: "<div></div>",
22+
remove: null,
23+
select: null,
24+
show: null,
25+
spinner: "<em>Loading&#8230;</em>",
26+
tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>"
27+
};
28+
29+
// FAIL: falsy values break the cookie option
30+
commonWidgetTests( "tabs", { defaults: tabs_defaults } );

‎tests/unit/tabs/tabs_deprecated.html

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<title>jQuery UI Tabs Test Suite</title>
6+
7+
<link type="text/css" href="../../../themes/base/jquery.ui.tabs.css" rel="stylesheet" />
8+
9+
<script type="text/javascript" src="../../../jquery-1.5.1.js"></script>
10+
<script type="text/javascript" src="../../../external/jquery.cookie.js"></script>
11+
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
12+
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
13+
<script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script>
14+
15+
<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
16+
<script type="text/javascript" src="../../../external/qunit.js"></script>
17+
<script type="text/javascript" src="../../jquery.simulate.js"></script>
18+
<script type="text/javascript" src="../testsuite.js"></script>
19+
20+
<script type="text/javascript" src="tabs_core.js"></script>
21+
<script type="text/javascript" src="tabs_defaults_deprecated.js"></script>
22+
<script type="text/javascript" src="tabs_events.js"></script>
23+
<script type="text/javascript" src="tabs_methods.js"></script>
24+
<script type="text/javascript" src="tabs_options.js"></script>
25+
<script type="text/javascript" src="tabs_tickets.js"></script>
26+
<script type="text/javascript" src="tabs_deprecated.js"></script>
27+
28+
<script type="text/javascript">
29+
// disable this stale testsuite for testswarm only
30+
var url = window.location.search;
31+
url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) );
32+
if ( url && url.indexOf("http") == 0 ) {
33+
// reset config to kill previous tests; make sure testsuite.js is loaded afterwards to init the testswarm script
34+
QUnit.init();
35+
test("tabs", function() { ok(true, "disabled tabs testsuite"); });
36+
}
37+
</script>
38+
<script type="text/javascript" src="../swarminject.js"></script>
39+
</head>
40+
<body>
41+
42+
<h1 id="qunit-header">jQuery UI Tabs Test Suite (deprecated)</h1>
43+
<h2 id="qunit-banner"></h2>
44+
<div id="qunit-testrunner-toolbar"></div>
45+
<h2 id="qunit-userAgent"></h2>
46+
<ol id="qunit-tests">
47+
</ol>
48+
49+
<div id="qunit-fixture">
50+
51+
<div id="tabs1">
52+
<ul>
53+
<li><a href="#fragment-1"><span>1</span></a></li>
54+
<li><a href="#fragment-2"><span>2</span></a></li>
55+
<li><a href="#fragment-3"><span>3</span></a></li>
56+
</ul>
57+
<div id="fragment-1"></div>
58+
<div id="fragment-2"></div>
59+
<div id="fragment-3"></div>
60+
</div>
61+
<div id="tabs2">
62+
<ul>
63+
<li><a href="#colon:test"><span>1</span></a></li>
64+
<li><a href="#inline-style"><span>2</span></a></li>
65+
<li><a href="data/test.html#test"><span>3</span></a></li>
66+
<li><a href="data/test.html" title="∫ßáö Սե"><span>4</span></a></li>
67+
</ul>
68+
<div id="colon:test"></div>
69+
<div style="height: 300px;" id="inline-style"></div>
70+
</div>
71+
<div id="tabs3">
72+
<div>
73+
<ul id="tabs3-list">
74+
<li><a href="#tabs3-1">1</a></li>
75+
</ul>
76+
</div>
77+
</div>
78+
<div id="tabs4">
79+
<ul id="tabs4-list">
80+
<li><a href="#tabs4-1">1</a></li>
81+
</ul>
82+
<ol>
83+
<li><a href="#tabs4-1">1</a></li>
84+
</ol>
85+
</div>
86+
<div id="tabs4a">
87+
<ol id="tabs4a-list">
88+
<li><a href="#tabs4a-1">1</a></li>
89+
</ol>
90+
<ul>
91+
<li><a href="#tabs4a-1">1</a></li>
92+
</ul>
93+
</div>
94+
<div id="tabs5">
95+
<div>
96+
<ul id="tabs5-list"></ul>
97+
</div>
98+
</div>
99+
<div id="tabs6">
100+
<ul id="tabs6-list">
101+
<li><a href="#tabs6-1">1</a>
102+
<ul>
103+
<li><a href="#item6-3">3</a></li>
104+
<li><a href="#item6-4">4</a></li>
105+
</ul>
106+
</li>
107+
<li><a href="#tabs6-2">2</a></li>
108+
</ul>
109+
<div id="tabs6-1"></div>
110+
<div id="tabs6-2"></div>
111+
</div>
112+
<div id="tabs7">
113+
<ul id="tabs7-list">
114+
<li><a href="#tabs7-1">1</a></li>
115+
<li><a href="#tabs7-2">2</a></li>
116+
</ul>
117+
<div id="tabs7-2"></div>
118+
<div id="tabs7-1"></div>
119+
</div>
120+
</div>
121+
</body>
122+
</html>

0 commit comments

Comments
 (0)