diff options
| author | billy gates <Jacobthornton@gmail.com> | 2012-10-18 09:30:40 +0400 |
|---|---|---|
| committer | billy gates <Jacobthornton@gmail.com> | 2012-10-18 09:30:40 +0400 |
| commit | 24b5e6cb142ad5ac530c0815ebf1cc102e2e381b (patch) | |
| tree | 184c0016a6aa598bdefe8dcf39f90aba6f8aa8cd /js | |
| parent | a2fc01444eda94963dce3ce845b9c76bfef363e5 (diff) | |
| parent | 48a8dd2a23f11981d42785db4091c029b5b7e781 (diff) | |
Merge pull request #5366 from Sinetheta/2.1.2-wip
Fix for #5362
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-tab.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/bootstrap-tab.js | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index 4fb3c38399..b4e142864e 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -49,7 +49,7 @@ if ( $this.parent('li').hasClass('active') ) return - previous = $ul.find('.active a').last()[0] + previous = $ul.find('.active:last a')[0] e = $.Event('show', { relatedTarget: previous diff --git a/js/tests/unit/bootstrap-tab.js b/js/tests/unit/bootstrap-tab.js index 9878047810..40f9a7406d 100644 --- a/js/tests/unit/bootstrap-tab.js +++ b/js/tests/unit/bootstrap-tab.js @@ -58,4 +58,23 @@ $(function () { .tab('show') }) + test("show and shown events should reference correct relatedTarget", function () { + var dropHTML = + '<ul class="drop">' + + '<li class="dropdown"><a data-toggle="dropdown" href="#">1</a>' + + '<ul class="dropdown-menu">' + + '<li><a href="#1-1" data-toggle="tab">1-1</a></li>' + + '<li><a href="#1-2" data-toggle="tab">1-2</a></li>' + + '</ul>' + + '</li>' + + '</ul>' + + $(dropHTML).find('ul>li:first a').tab('show').end() + .find('ul>li:last a').on('show', function(event){ + equals(event.relatedTarget.hash, "#1-1") + }).on('shown', function(event){ + equals(event.relatedTarget.hash, "#1-1") + }).tab('show') + }) + })
\ No newline at end of file |