From 5a35555a72e96e4083e2be559b12d75e8095a1c6 Mon Sep 17 00:00:00 2001 From: Bootstrap's Grunt bot Date: Tue, 30 Dec 2014 12:31:08 +0000 Subject: automatic grunt dist --- dist/js/bootstrap.js | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 7c304856b..2a1626618 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1671,18 +1671,12 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.tooltip') - var options = typeof option == 'object' && option - var selector = options && options.selector + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option if (!data && option == 'destroy') return - if (selector) { - if (!data) $this.data('bs.tooltip', (data = {})) - if (!data[selector]) data[selector] = new Tooltip(this, options) - } else { - if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) - } + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) if (typeof option == 'string') data[option]() }) } @@ -1791,18 +1785,12 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.popover') - var options = typeof option == 'object' && option - var selector = options && options.selector + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option if (!data && option == 'destroy') return - if (selector) { - if (!data) $this.data('bs.popover', (data = {})) - if (!data[selector]) data[selector] = new Popover(this, options) - } else { - if (!data) $this.data('bs.popover', (data = new Popover(this, options))) - } + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) if (typeof option == 'string') data[option]() }) } -- cgit v1.2.3 From 6c383c5102011102d0d5157f6e37d7520f103ae7 Mon Sep 17 00:00:00 2001 From: Bootstrap's Grunt bot Date: Thu, 1 Jan 2015 00:02:16 +0000 Subject: automatic grunt dist --- dist/js/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 2a1626618..48c70480b 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1,6 +1,6 @@ /*! * Bootstrap v3.3.1 (http://getbootstrap.com) - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -- cgit v1.2.3 From 57260f16b364e4cb559cd65159197fd1cf5248f7 Mon Sep 17 00:00:00 2001 From: Bootstrap's Grunt bot Date: Thu, 1 Jan 2015 19:02:43 +0000 Subject: automatic grunt dist --- dist/js/bootstrap.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 48c70480b..42e92bf5a 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -19,7 +19,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: transition.js v3.3.1 * http://getbootstrap.com/javascript/#transitions * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -79,7 +79,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: alert.js v3.3.1 * http://getbootstrap.com/javascript/#alerts * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -174,7 +174,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: button.js v3.3.1 * http://getbootstrap.com/javascript/#buttons * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -291,7 +291,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: carousel.js v3.3.1 * http://getbootstrap.com/javascript/#carousel * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -529,7 +529,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: collapse.js v3.3.1 * http://getbootstrap.com/javascript/#collapse * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -741,7 +741,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: dropdown.js v3.3.1 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -903,7 +903,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: modal.js v3.3.1 * http://getbootstrap.com/javascript/#modals * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -1229,7 +1229,7 @@ if (typeof jQuery === 'undefined') { * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -1701,7 +1701,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: popover.js v3.3.1 * http://getbootstrap.com/javascript/#popovers * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -1815,7 +1815,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: scrollspy.js v3.3.1 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -1991,7 +1991,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: tab.js v3.3.1 * http://getbootstrap.com/javascript/#tabs * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -2145,7 +2145,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: affix.js v3.3.1 * http://getbootstrap.com/javascript/#affix * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ -- cgit v1.2.3 From 9fdf7a26e12f17282f565bc18ca16be2ad865153 Mon Sep 17 00:00:00 2001 From: Bootstrap's Grunt bot Date: Tue, 13 Jan 2015 20:31:25 +0000 Subject: automatic grunt dist --- dist/js/bootstrap.js | 1 + 1 file changed, 1 insertion(+) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 42e92bf5a..ab0ae1e5b 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -9,6 +9,7 @@ if (typeof jQuery === 'undefined') { } +function ($) { + 'use strict'; var version = $.fn.jquery.split(' ')[0].split('.') if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) { throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher') -- cgit v1.2.3 From b7c332f183d52c6b1432a4eb511b8c61478bfc81 Mon Sep 17 00:00:00 2001 From: Bootstrap's Grunt bot Date: Fri, 16 Jan 2015 16:41:05 +0000 Subject: automatic grunt dist --- dist/js/bootstrap.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index ab0ae1e5b..705412c38 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1573,10 +1573,10 @@ if (typeof jQuery === 'undefined') { } Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { - return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : - placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : + return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : + placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : - /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } } -- cgit v1.2.3