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/modal.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/modal.js')
| -rw-r--r-- | js/tests/unit/modal.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index 6b2074327..281978142 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -157,16 +157,15 @@ $(function () { test('should trigger hide event once when clicking outside of modal-content', function () { stop() $.support.transition = false - var div = $('<div id="modal-test"><div class="contents"></div></div>') + var triggered + var div = $('<div id="modal-test"><div class="contents"></div></div>') + div .bind('shown.bs.modal', function () { triggered = 0 $('#modal-test').click() }) - .one('hidden.bs.modal', function () { - div.modal('show') - }) .bind('hide.bs.modal', function () { triggered += 1 ok(triggered === 1, 'modal hide triggered once') |