diff options
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index e27bba13c..e9be21557 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -314,6 +314,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") } Carousel.DEFAULTS = { interval: 5000 , pause: 'hover' + , wrap: true } Carousel.prototype.cycle = function (e) { @@ -378,12 +379,15 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") } var fallback = type == 'next' ? 'first' : 'last' var that = this + if (!$next.length) { + if (!this.options.wrap) return + $next = this.$element.find('.item')[fallback]() + } + this.sliding = true isCycling && this.pause() - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) if ($next.hasClass('active')) return @@ -851,7 +855,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") } this.$backdrop = this.isShown = null - if (this.options.remote) this.$element.find('.modal-body').load(this.options.remote) + if (this.options.remote) this.$element.load(this.options.remote) } Modal.DEFAULTS = { @@ -1067,7 +1071,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") } /* ======================================================================== * Bootstrap: tooltip.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#affix + * http://twbs.github.com/bootstrap/javascript.html#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== * Copyright 2012 Twitter, Inc. |