diff options
| author | Mark Otto <[email protected]> | 2011-12-21 18:39:02 -0600 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-12-21 18:39:02 -0600 |
| commit | 9fb380151d477f1741b7609ade7a9e7fd5450b2c (patch) | |
| tree | a749f2b6917c09770af1586ae9f83e46115de7eb /js/bootstrap-carousel.js | |
| parent | 12a0d69454a2831031035d19237d36d38bb2c2a9 (diff) | |
| parent | a5a98a8a984512011dac1216b432b86c6eff96a4 (diff) | |
| download | bootstrap-9fb380151d477f1741b7609ade7a9e7fd5450b2c.tar.xz bootstrap-9fb380151d477f1741b7609ade7a9e7fd5450b2c.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
docs/javascript.html
Diffstat (limited to 'js/bootstrap-carousel.js')
| -rw-r--r-- | js/bootstrap-carousel.js | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 9513b4cd2..ed4b8f3fa 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -25,8 +25,8 @@ /* CAROUSEL CLASS DEFINITION * ========================= */ - var Carousel = function ( el ) { - $(el).delegate(dismiss, 'click', this.close) + var Carousel = function () { + } Carousel.prototype = { @@ -40,20 +40,12 @@ $.fn.carousel = function ( option ) { return this.each(function () { var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) + , data = $this.data('carousel') + if (!data) $this.data('carousel', (data = new Carousel(this))) if (typeof option == 'string') data[option].call($this) }) } - $.fn.carousel.Carousel = Carousel - - - /* CAROUSEL DATA-API - * ================= */ - - // $(function () { - // $('body').delegate(dismiss, 'click.alert.data-api', Alert.prototype.close) - // }) + $.fn.carousel.Constructor = Carousel -}( window.jQuery || window.ender )
\ No newline at end of file +}( window.jQuery )
\ No newline at end of file |