mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 12:59:05 +02:00
Code Issues Releases Wiki Activity

Merge pull request #11966 from colllin/noconflict

Browse Source 
Fix #11464 - JS noConflict() mode not working in 3.0.x
This commit is contained in:
Mark Otto
2014-04-30 17:43:43 -07:00
parent abc797696d a9f2b6ce0f
commit f20f66604b
22 changed files with 415 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/carousel.js
View File

@@ -150,9 +150,7 @@
// CAROUSEL PLUGIN DEFINITION
// ==========================
var old = $.fn.carousel
$.fn.carousel = function (option) {
function Plugin(option) {
return this.each(function () {
var $this = $(this)
var data = $this.data('bs.carousel')
@@ -166,6 +164,9 @@
})
}
var old = $.fn.carousel
$.fn.carousel = Plugin
$.fn.carousel.Constructor = Carousel
@@ -188,7 +189,7 @@
var slideIndex = $this.attr('data-slide-to')
if (slideIndex) options.interval = false
$target.carousel(options)
Plugin.call($target, options)
if (slideIndex = $this.attr('data-slide-to')) {
$target.data('bs.carousel').to(slideIndex)
@@ -200,7 +201,7 @@
$(window).on('load', function () {
$('[data-ride="carousel"]').each(function () {
var $carousel = $(this)
$carousel.carousel($carousel.data())
Plugin.call($carousel, $carousel.data())
})
})