framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master, update to Bootstrap 2.2.1

Browse Source
This commit is contained in:
Ben Word
2012-11-01 09:28:34 -05:00
parent 85b0f59455 b843a0fee8
commit ac18e86fe8
22 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/plugins/bootstrap/bootstrap-carousel.js vendored
View File

@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-carousel.js v2.2.0
* bootstrap-carousel.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -168,7 +168,7 @@
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
var $this = $(this), href
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
, options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data())
, options = $.extend({}, $target.data(), $this.data())
$target.carousel(options)
e.preventDefault()
})