Skip to content

B
bootstrap
Commit a0e98ade authored by fat's avatar fat
Browse files
Options

Merge branch 'fix-13386'

parents b31c35b6 0aa01f63
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
js/carousel.js
View file @ a0e98ade
...@@ -199,6 +199,7 @@ ...@@ -199,6 +199,7 @@
var href var href
var $this = $(this) var $this = $(this)
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7 var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
if (!$target.hasClass('carousel')) return
var options = $.extend({}, $target.data(), $this.data()) var options = $.extend({}, $target.data(), $this.data())
var slideIndex = $this.attr('data-slide-to') var slideIndex = $this.attr('data-slide-to')
if (slideIndex) options.interval = false if (slideIndex) options.interval = false
......
Markdown is supported
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