Skip to content
GitLab
Commit 922cd046 authored by Mark Otto's avatar Mark Otto
Browse files

grunt after that carousel merge

parent 1bb00011
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
+3 -3
dist/js/bootstrap.js
+ 1
- 1
View file @ 922cd046
...@@ -421,7 +421,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" ...@@ -421,7 +421,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
that.sliding = false that.sliding = false
setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0) setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
}) })
.emulateTransitionEnd(600) .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
} else { } else {
this.$element.trigger(e) this.$element.trigger(e)
if (e.isDefaultPrevented()) return if (e.isDefaultPrevented()) return
......
dist/js/bootstrap.min.js
+ 1
- 1
View file @ 922cd046
This diff is collapsed.
docs-assets/js/raw-files.js
+ 1
- 1
View file @ 922cd046
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment