Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes #9836 #12983

Merged
merged 2 commits into from
Mar 9, 2014
Merged

fixes #9836 #12983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d96e69
fixes #9836
fat Mar 9, 2014
b8ab0c6
grunt
mdo Mar 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions dist/js/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re

this.transitioning = 1

var complete = function () {
var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.$element
.removeClass('collapsing')
.addClass('collapse in')
Expand Down Expand Up @@ -555,7 +556,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re

this.transitioning = 1

var complete = function () {
var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.transitioning = 0
this.$element
.trigger('hidden.bs.collapse')
Expand Down
2 changes: 1 addition & 1 deletion dist/js/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/js/customize.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/js/raw-files.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dist/js/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions js/collapse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@

this.transitioning = 1

var complete = function () {
var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.$element
.removeClass('collapsing')
.addClass('collapse in')
Expand Down Expand Up @@ -95,7 +96,8 @@

this.transitioning = 1

var complete = function () {
var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.transitioning = 0
this.$element
.trigger('hidden.bs.collapse')
Expand Down
2 changes: 1 addition & 1 deletion test-infra/npm-shrinkwrap.canonical.json
View file
Open in desktop

Large diffs are not rendered by default.