diff options
| author | fat <[email protected]> | 2013-08-02 15:10:47 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-08-02 15:10:47 -0700 |
| commit | e969d2ff18214c8d3b2730155d933c0acd614344 (patch) | |
| tree | b529f68e63c0b6e98003ec9f9d5d771de500011b /js | |
| parent | 69f99201327662ec1bd0e15516a064e6dcc9236c (diff) | |
| parent | 173dac4e54281312ebb7ff993df20caffbc56840 (diff) | |
| download | bootstrap-e969d2ff18214c8d3b2730155d933c0acd614344.tar.xz bootstrap-e969d2ff18214c8d3b2730155d933c0acd614344.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'js')
| -rw-r--r-- | js/collapse.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/dropdown.js | 12 | ||||
| -rw-r--r-- | js/tooltip.js | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/js/collapse.js b/js/collapse.js index 34ac3c7fa..ab575515d 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -48,7 +48,7 @@ this.$element.trigger(startEvent) if (startEvent.isDefaultPrevented()) return - var actives = this.$parent && this.$parent.find('> .accordion-group > .in') + var actives = this.$parent && this.$parent.find('> .accordion-group > .in') if (actives && actives.length) { var hasData = actives.data('bs.collapse') diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js index e45bd0a46..02256965d 100644 --- a/js/tests/unit/dropdown.js +++ b/js/tests/unit/dropdown.js @@ -165,9 +165,9 @@ $(function () { .appendTo('#qunit-fixture') .find('[data-toggle="dropdown"]') .dropdown() - + stop() - + dropdown .parent('.dropdown') .bind('show.bs.dropdown', function () { @@ -177,7 +177,7 @@ $(function () { ok(true, 'hide was called') start() }) - + dropdown.click() $(document.body).click() }) @@ -199,9 +199,9 @@ $(function () { .appendTo('#qunit-fixture') .find('[data-toggle="dropdown"]') .dropdown() - + stop() - + dropdown .parent('.dropdown') .bind('shown.bs.dropdown', function () { @@ -211,7 +211,7 @@ $(function () { ok(true, 'hide was called') start() }) - + dropdown.click() $(document.body).click() }) diff --git a/js/tooltip.js b/js/tooltip.js index a954923be..30e3ae140 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -249,6 +249,8 @@ var $tip = this.tip() var e = $.Event('hide.bs.' + this.type) + function complete() { $tip.detach() } + this.$element.trigger(e) if (e.isDefaultPrevented()) return @@ -257,9 +259,9 @@ $.support.transition && this.$tip.hasClass('fade') ? $tip - .one($.support.transition.end, $tip.detach) + .one($.support.transition.end, complete) .emulateTransitionEnd(150) : - $tip.detach() + complete() this.$element.trigger('hidden.bs.' + this.type) |