Permalink
Please
sign in to comment.
Browse files
Merge branch 'tabs_1.9' of https://github.com/petersendidit/jquery-ui …
…into petersendidit-tabs
- Loading branch information...
scottgonzalez
committed
Mar 29, 2011
Showing
with
1,359 additions
and 751 deletions.
- +2 −1 demos/tabs/ajax.html
- +3 −0 tests/unit/tabs/tabs.html
- +0 −30 tests/unit/tabs/tabs_core.js
- +4 −14 tests/unit/tabs/tabs_defaults.js
- +30 −0 tests/unit/tabs/tabs_defaults_deprecated.js
- +122 −0 tests/unit/tabs/tabs_deprecated.html
- +343 −0 tests/unit/tabs/tabs_deprecated.js
- +32 −62 tests/unit/tabs/tabs_events.js
- +36 −84 tests/unit/tabs/tabs_methods.js
- +18 −75 tests/unit/tabs/tabs_options.js
- +21 −37 tests/unit/tabs/tabs_tickets.js
- +3 −4 themes/base/jquery.ui.tabs.css
- +745 −444 ui/jquery.ui.tabs.js
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * tabs_defaults.js | ||
| */ | ||
|
|
||
| var tabs_defaults = { | ||
| activate: null, | ||
| add: null, | ||
| ajaxOptions: null, | ||
| beforeload: null, | ||
| beforeActivate: null, | ||
| cache: false, | ||
| collapsible: false, | ||
| cookie: null, | ||
| disable: null, | ||
| disabled: false, | ||
| enable: null, | ||
| event: "click", | ||
| fx: null, | ||
| idPrefix: "ui-tabs-", | ||
| load: null, | ||
| panelTemplate: "<div></div>", | ||
| remove: null, | ||
| select: null, | ||
| show: null, | ||
| spinner: "<em>Loading…</em>", | ||
| tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>" | ||
| }; | ||
|
|
||
| // FAIL: falsy values break the cookie option | ||
| commonWidgetTests( "tabs", { defaults: tabs_defaults } ); |
| @@ -0,0 +1,122 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <title>jQuery UI Tabs Test Suite</title> | ||
|
|
||
| <link type="text/css" href="../../../themes/base/jquery.ui.tabs.css" rel="stylesheet" /> | ||
|
|
||
| <script type="text/javascript" src="../../../jquery-1.5.1.js"></script> | ||
| <script type="text/javascript" src="../../../external/jquery.cookie.js"></script> | ||
| <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> | ||
| <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> | ||
| <script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script> | ||
|
|
||
| <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/> | ||
| <script type="text/javascript" src="../../../external/qunit.js"></script> | ||
| <script type="text/javascript" src="../../jquery.simulate.js"></script> | ||
| <script type="text/javascript" src="../testsuite.js"></script> | ||
|
|
||
| <script type="text/javascript" src="tabs_core.js"></script> | ||
| <script type="text/javascript" src="tabs_defaults_deprecated.js"></script> | ||
| <script type="text/javascript" src="tabs_events.js"></script> | ||
| <script type="text/javascript" src="tabs_methods.js"></script> | ||
| <script type="text/javascript" src="tabs_options.js"></script> | ||
| <script type="text/javascript" src="tabs_tickets.js"></script> | ||
| <script type="text/javascript" src="tabs_deprecated.js"></script> | ||
|
|
||
| <script type="text/javascript"> | ||
| // disable this stale testsuite for testswarm only | ||
| var url = window.location.search; | ||
| url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) ); | ||
| if ( url && url.indexOf("http") == 0 ) { | ||
| // reset config to kill previous tests; make sure testsuite.js is loaded afterwards to init the testswarm script | ||
| QUnit.init(); | ||
| test("tabs", function() { ok(true, "disabled tabs testsuite"); }); | ||
| } | ||
| </script> | ||
| <script type="text/javascript" src="../swarminject.js"></script> | ||
| </head> | ||
| <body> | ||
|
|
||
| <h1 id="qunit-header">jQuery UI Tabs Test Suite (deprecated)</h1> | ||
| <h2 id="qunit-banner"></h2> | ||
| <div id="qunit-testrunner-toolbar"></div> | ||
| <h2 id="qunit-userAgent"></h2> | ||
| <ol id="qunit-tests"> | ||
| </ol> | ||
|
|
||
| <div id="qunit-fixture"> | ||
|
|
||
| <div id="tabs1"> | ||
| <ul> | ||
| <li><a href="#fragment-1"><span>1</span></a></li> | ||
| <li><a href="#fragment-2"><span>2</span></a></li> | ||
| <li><a href="#fragment-3"><span>3</span></a></li> | ||
| </ul> | ||
| <div id="fragment-1"></div> | ||
| <div id="fragment-2"></div> | ||
| <div id="fragment-3"></div> | ||
| </div> | ||
| <div id="tabs2"> | ||
| <ul> | ||
| <li><a href="#colon:test"><span>1</span></a></li> | ||
| <li><a href="#inline-style"><span>2</span></a></li> | ||
| <li><a href="data/test.html#test"><span>3</span></a></li> | ||
| <li><a href="data/test.html" title="∫ßáö Սե"><span>4</span></a></li> | ||
| </ul> | ||
| <div id="colon:test"></div> | ||
| <div style="height: 300px;" id="inline-style"></div> | ||
| </div> | ||
| <div id="tabs3"> | ||
| <div> | ||
| <ul id="tabs3-list"> | ||
| <li><a href="#tabs3-1">1</a></li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| <div id="tabs4"> | ||
| <ul id="tabs4-list"> | ||
| <li><a href="#tabs4-1">1</a></li> | ||
| </ul> | ||
| <ol> | ||
| <li><a href="#tabs4-1">1</a></li> | ||
| </ol> | ||
| </div> | ||
| <div id="tabs4a"> | ||
| <ol id="tabs4a-list"> | ||
| <li><a href="#tabs4a-1">1</a></li> | ||
| </ol> | ||
| <ul> | ||
| <li><a href="#tabs4a-1">1</a></li> | ||
| </ul> | ||
| </div> | ||
| <div id="tabs5"> | ||
| <div> | ||
| <ul id="tabs5-list"></ul> | ||
| </div> | ||
| </div> | ||
| <div id="tabs6"> | ||
| <ul id="tabs6-list"> | ||
| <li><a href="#tabs6-1">1</a> | ||
| <ul> | ||
| <li><a href="#item6-3">3</a></li> | ||
| <li><a href="#item6-4">4</a></li> | ||
| </ul> | ||
| </li> | ||
| <li><a href="#tabs6-2">2</a></li> | ||
| </ul> | ||
| <div id="tabs6-1"></div> | ||
| <div id="tabs6-2"></div> | ||
| </div> | ||
| <div id="tabs7"> | ||
| <ul id="tabs7-list"> | ||
| <li><a href="#tabs7-1">1</a></li> | ||
| <li><a href="#tabs7-2">2</a></li> | ||
| </ul> | ||
| <div id="tabs7-2"></div> | ||
| <div id="tabs7-1"></div> | ||
| </div> | ||
| </div> | ||
| </body> | ||
| </html> |
Oops, something went wrong.
0 comments on commit
fa13c4a