Hopiu/bootstrap
1
0
Fork 0
mirror of https://github.com/Hopiu/bootstrap.git synced 2026-03-19 22:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

Browse source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto 2012-02-21 08:25:19 -08:00
commit 80abc50d3e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View file

Binary file not shown.

4
docs/assets/js/bootstrap-carousel.js vendored
View file

@ -83,14 +83,14 @@
, fallback = type == 'next' ? 'first' : 'last'
, that = this
if (!$next.length) return
this.sliding = true
isCycling && this.pause()
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
if ($next.hasClass('active')) return
if (!$.support.transition && this.$element.hasClass('slide')) {
this.$element.trigger('slide')
$active.removeClass('active')

4
js/bootstrap-carousel.js vendored
View file

@ -83,14 +83,14 @@
, fallback = type == 'next' ? 'first' : 'last'
, that = this
if (!$next.length) return
this.sliding = true
isCycling && this.pause()
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
if ($next.hasClass('active')) return
if (!$.support.transition && this.$element.hasClass('slide')) {
this.$element.trigger('slide')
$active.removeClass('active')