diff options
| author | Mark Otto <[email protected]> | 2014-01-18 14:11:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-18 14:11:55 -0800 |
| commit | cd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa (patch) | |
| tree | 0c0a716f3f567c7bd17fb9f6fb254100d78d0e18 /js/tests/unit/tab.js | |
| parent | b121207e10ad20e6d1d8dc269f71697ad26a67e6 (diff) | |
| parent | b1721f42cc8298fb691530614ee6d52389872e25 (diff) | |
| download | bootstrap-cd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa.tar.xz bootstrap-cd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa.zip | |
Merge branch 'master' into bg-variant
Diffstat (limited to 'js/tests/unit/tab.js')
| -rw-r--r-- | js/tests/unit/tab.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js index 59bedf391..b8dbf2c18 100644 --- a/js/tests/unit/tab.js +++ b/js/tests/unit/tab.js @@ -73,11 +73,14 @@ $(function () { '</ul>' $(dropHTML).find('ul>li:first a').tab('show').end() - .find('ul>li:last a').on('show', function (event) { + .find('ul>li:last a') + .on('show.bs.tab', function (event) { equal(event.relatedTarget.hash, '#1-1') - }).on('shown', function (event) { + }) + .on('show.bs.tab', function (event) { equal(event.relatedTarget.hash, '#1-1') - }).tab('show') + }) + .tab('show') }) }) |