From bf2ab457eae6d54954b8e2a22596bcdd216d0ca5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 11 Aug 2013 14:59:39 -0700 Subject: fix comment in tooltip --- js/tooltip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/tooltip.js b/js/tooltip.js index eedadcbe9..e0732a5a9 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -1,6 +1,6 @@ /* ======================================================================== * 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. -- cgit v1.2.3 From 89b3cb0dacd71fc7b20e125851f05f9ed266b50d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 11 Aug 2013 15:17:04 -0700 Subject: fixes #9318 --- js/modal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/modal.js b/js/modal.js index 420f13d5f..e0f8b7a0e 100644 --- a/js/modal.js +++ b/js/modal.js @@ -29,7 +29,7 @@ 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 = { -- cgit v1.2.3 From 92c2ad98e753c64a2bd6e3fb94870a2ad3ee0333 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 11 Aug 2013 15:41:06 -0700 Subject: fixes #8983 --- js/carousel.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/carousel.js b/js/carousel.js index d4bcb88b7..d8c4c243c 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -41,6 +41,7 @@ Carousel.DEFAULTS = { interval: 5000 , pause: 'hover' + , wrap: true } Carousel.prototype.cycle = function (e) { @@ -105,12 +106,15 @@ 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 -- cgit v1.2.3