From b05a287eb6d9cebe8590667ef260dd8ec70d5717 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 14 Oct 2013 20:47:56 -0700 Subject: run grunt --- 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 82ebff2b8..8b3ae5a0a 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1769,7 +1769,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" Tab.prototype.show = function () { var $this = this.element var $ul = $this.closest('ul:not(.dropdown-menu)') - var selector = $this.attr('data-target') + var selector = $this.data('target') if (!selector) { selector = $this.attr('href') -- cgit v1.2.3 From 20cba845c26b04799de7a7a6d9554e9fd6d21eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 24 Oct 2013 19:32:41 +0200 Subject: Add another newline to improve final code readability This divides banner from code. --- dist/js/bootstrap.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 8b3ae5a0a..4bbaccfe2 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -5,6 +5,7 @@ * * Designed and built with all the love in the world by @mdo and @fat. */ + if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") } /* ======================================================================== @@ -277,7 +278,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: carousel.js v3.0.0 * http://twbs.github.com/bootstrap/javascript.html#carousel * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -495,7 +496,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: collapse.js v3.0.0 * http://twbs.github.com/bootstrap/javascript.html#collapse * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -675,7 +676,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: dropdown.js v3.0.0 * http://twbs.github.com/bootstrap/javascript.html#dropdowns * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -830,7 +831,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: modal.js v3.0.0 * http://twbs.github.com/bootstrap/javascript.html#modals * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1078,7 +1079,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * http://twbs.github.com/bootstrap/javascript.html#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1464,7 +1465,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: popover.js v3.0.0 * http://twbs.github.com/bootstrap/javascript.html#popovers * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1582,7 +1583,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: scrollspy.js v3.0.0 * http://twbs.github.com/bootstrap/javascript.html#scrollspy * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1741,7 +1742,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: tab.js v3.0.0 * http://twbs.github.com/bootstrap/javascript.html#tabs * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1877,7 +1878,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * Bootstrap: affix.js v3.0.0 * http://twbs.github.com/bootstrap/javascript.html#affix * ======================================================================== - * Copyright 2012 Twitter, Inc. + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. -- cgit v1.2.3 From 147837efaa48696debf93c62e8d872f72d866117 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Oct 2013 08:00:32 -0700 Subject: more grunt --- 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 4bbaccfe2..d5c77bfcd 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -10,7 +10,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" /* ======================================================================== * Bootstrap: transition.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#transitions + * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2013 Twitter, Inc. * @@ -67,7 +67,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" /* ======================================================================== * Bootstrap: alert.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#alerts + * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2013 Twitter, Inc. * @@ -166,7 +166,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" /* ======================================================================== * Bootstrap: button.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#buttons + * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2013 Twitter, Inc. * @@ -276,7 +276,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" /* ======================================================================== * Bootstrap: carousel.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#carousel + * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2013 Twitter, Inc. * @@ -494,7 +494,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" /* ======================================================================== * Bootstrap: collapse.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#collapse + * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2013 Twitter, Inc. * @@ -674,7 +674,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" /* ======================================================================== * Bootstrap: dropdown.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#dropdowns + * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2013 Twitter, Inc. * @@ -829,7 +829,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" /* ======================================================================== * Bootstrap: modal.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#modals + * http://getbootstrap.com/javascript/#modals * ======================================================================== * Copyright 2013 Twitter, Inc. * @@ -1076,7 +1076,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" /* ======================================================================== * Bootstrap: tooltip.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#tooltip + * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1463,7 +1463,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" /* ======================================================================== * Bootstrap: popover.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#popovers + * http://getbootstrap.com/javascript/#popovers * ======================================================================== * Copyright 2013 Twitter, Inc. * @@ -1581,7 +1581,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" /* ======================================================================== * Bootstrap: scrollspy.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#scrollspy + * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== * Copyright 2013 Twitter, Inc. * @@ -1740,7 +1740,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" /* ======================================================================== * Bootstrap: tab.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#tabs + * http://getbootstrap.com/javascript/#tabs * ======================================================================== * Copyright 2013 Twitter, Inc. * @@ -1876,7 +1876,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" /* ======================================================================== * Bootstrap: affix.js v3.0.0 - * http://twbs.github.com/bootstrap/javascript.html#affix + * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2013 Twitter, Inc. * -- cgit v1.2.3 From 867e2bef8d9c9b901022899227b306a532f5baf3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Oct 2013 10:03:56 -0700 Subject: 3.0.1 --- 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 d5c77bfcd..4d518ae13 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.0.0 by @fat and @mdo + * Bootstrap v3.0.1 by @fat and @mdo * Copyright 2013 Twitter, Inc. * Licensed under http://www.apache.org/licenses/LICENSE-2.0 * -- cgit v1.2.3 From 4e0d022de5b0d27b063156533dfcc248fc08257e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 1 Nov 2013 17:15:34 -0700 Subject: update version numbers in JS file comment headers to v3.0.1 & regrunt --- 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 4d518ae13..3b05bb9f7 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -9,7 +9,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") } /* ======================================================================== - * Bootstrap: transition.js v3.0.0 + * Bootstrap: transition.js v3.0.1 * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -66,7 +66,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(window.jQuery); /* ======================================================================== - * Bootstrap: alert.js v3.0.0 + * Bootstrap: alert.js v3.0.1 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -165,7 +165,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(window.jQuery); /* ======================================================================== - * Bootstrap: button.js v3.0.0 + * Bootstrap: button.js v3.0.1 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -275,7 +275,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(window.jQuery); /* ======================================================================== - * Bootstrap: carousel.js v3.0.0 + * Bootstrap: carousel.js v3.0.1 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -493,7 +493,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(window.jQuery); /* ======================================================================== - * Bootstrap: collapse.js v3.0.0 + * Bootstrap: collapse.js v3.0.1 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -673,7 +673,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(window.jQuery); /* ======================================================================== - * Bootstrap: dropdown.js v3.0.0 + * Bootstrap: dropdown.js v3.0.1 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -828,7 +828,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(window.jQuery); /* ======================================================================== - * Bootstrap: modal.js v3.0.0 + * Bootstrap: modal.js v3.0.1 * http://getbootstrap.com/javascript/#modals * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1075,7 +1075,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(window.jQuery); /* ======================================================================== - * Bootstrap: tooltip.js v3.0.0 + * Bootstrap: tooltip.js v3.0.1 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== @@ -1462,7 +1462,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(window.jQuery); /* ======================================================================== - * Bootstrap: popover.js v3.0.0 + * Bootstrap: popover.js v3.0.1 * http://getbootstrap.com/javascript/#popovers * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1580,7 +1580,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(window.jQuery); /* ======================================================================== - * Bootstrap: scrollspy.js v3.0.0 + * Bootstrap: scrollspy.js v3.0.1 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1739,7 +1739,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(window.jQuery); /* ======================================================================== - * Bootstrap: tab.js v3.0.0 + * Bootstrap: tab.js v3.0.1 * http://getbootstrap.com/javascript/#tabs * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1875,7 +1875,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(window.jQuery); /* ======================================================================== - * Bootstrap: affix.js v3.0.0 + * Bootstrap: affix.js v3.0.1 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2013 Twitter, Inc. -- cgit v1.2.3 From 89d489dfc701273b1898b69bde04cf5eb58b9f85 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 5 Nov 2013 16:58:18 -0800 Subject: re-grunt --- 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 3b05bb9f7..10d7c7d4c 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -63,7 +63,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" $.support.transition = transitionEnd() }) -}(window.jQuery); +}(jQuery); /* ======================================================================== * Bootstrap: alert.js v3.0.1 @@ -162,7 +162,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) -}(window.jQuery); +}(jQuery); /* ======================================================================== * Bootstrap: button.js v3.0.1 @@ -272,7 +272,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" e.preventDefault() }) -}(window.jQuery); +}(jQuery); /* ======================================================================== * Bootstrap: carousel.js v3.0.1 @@ -490,7 +490,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }) -}(window.jQuery); +}(jQuery); /* ======================================================================== * Bootstrap: collapse.js v3.0.1 @@ -670,7 +670,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" $target.collapse(option) }) -}(window.jQuery); +}(jQuery); /* ======================================================================== * Bootstrap: dropdown.js v3.0.1 @@ -825,7 +825,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle) .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) -}(window.jQuery); +}(jQuery); /* ======================================================================== * Bootstrap: modal.js v3.0.1 @@ -1072,7 +1072,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') }) .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) -}(window.jQuery); +}(jQuery); /* ======================================================================== * Bootstrap: tooltip.js v3.0.1 @@ -1459,7 +1459,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" return this } -}(window.jQuery); +}(jQuery); /* ======================================================================== * Bootstrap: popover.js v3.0.1 @@ -1577,7 +1577,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" return this } -}(window.jQuery); +}(jQuery); /* ======================================================================== * Bootstrap: scrollspy.js v3.0.1 @@ -1736,7 +1736,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }) -}(window.jQuery); +}(jQuery); /* ======================================================================== * Bootstrap: tab.js v3.0.1 @@ -1872,7 +1872,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" $(this).tab('show') }) -}(window.jQuery); +}(jQuery); /* ======================================================================== * Bootstrap: affix.js v3.0.1 @@ -1999,4 +1999,4 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }) -}(window.jQuery); +}(jQuery); -- cgit v1.2.3 From 6a4230556532d3d947a84aa0d07f57e40a68a9ff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 6 Nov 2013 12:57:28 -0800 Subject: bump versions to v3.0.2 --- 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 10d7c7d4c..c0d3ed3c7 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.0.1 by @fat and @mdo + * Bootstrap v3.0.2 by @fat and @mdo * Copyright 2013 Twitter, Inc. * Licensed under http://www.apache.org/licenses/LICENSE-2.0 * -- cgit v1.2.3 From d1048a78371862c295613f484a06dacfb275d916 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 6 Nov 2013 13:02:15 -0800 Subject: run grunt after version bumps --- 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 c0d3ed3c7..1c638ab44 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -9,7 +9,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") } /* ======================================================================== - * Bootstrap: transition.js v3.0.1 + * Bootstrap: transition.js v3.0.2 * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -66,7 +66,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: alert.js v3.0.1 + * Bootstrap: alert.js v3.0.2 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -165,7 +165,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: button.js v3.0.1 + * Bootstrap: button.js v3.0.2 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -275,7 +275,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: carousel.js v3.0.1 + * Bootstrap: carousel.js v3.0.2 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -493,7 +493,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: collapse.js v3.0.1 + * Bootstrap: collapse.js v3.0.2 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -673,7 +673,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: dropdown.js v3.0.1 + * Bootstrap: dropdown.js v3.0.2 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -828,7 +828,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: modal.js v3.0.1 + * Bootstrap: modal.js v3.0.2 * http://getbootstrap.com/javascript/#modals * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1075,7 +1075,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: tooltip.js v3.0.1 + * Bootstrap: tooltip.js v3.0.2 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== @@ -1462,7 +1462,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: popover.js v3.0.1 + * Bootstrap: popover.js v3.0.2 * http://getbootstrap.com/javascript/#popovers * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1580,7 +1580,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: scrollspy.js v3.0.1 + * Bootstrap: scrollspy.js v3.0.2 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1739,7 +1739,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: tab.js v3.0.1 + * Bootstrap: tab.js v3.0.2 * http://getbootstrap.com/javascript/#tabs * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1875,7 +1875,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: affix.js v3.0.1 + * Bootstrap: affix.js v3.0.2 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2013 Twitter, Inc. -- cgit v1.2.3 From 7a3f41b11b15f4b931aa43cf1a2fd7a00db6f817 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 5 Nov 2013 22:20:29 -0800 Subject: <3 @asselin for figuring out this combo of 2 patches for #9920; re-grunt --- dist/js/bootstrap.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 1c638ab44..4798d309e 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -220,15 +220,21 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" Button.prototype.toggle = function () { var $parent = this.$element.closest('[data-toggle="buttons"]') + var changed = true if ($parent.length) { var $input = this.$element.find('input') - .prop('checked', !this.$element.hasClass('active')) - .trigger('change') - if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active') + if ($input.prop('type') === 'radio') { + // see if clicking on current one + if ($input.prop('checked') && this.$element.hasClass('active')) + changed = false + else + $parent.find('.active').removeClass('active') + } + if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change') } - this.$element.toggleClass('active') + if (changed) this.$element.toggleClass('active') } -- cgit v1.2.3 From 7545da2e3c5488b1bcc9c70fecac759232466756 Mon Sep 17 00:00:00 2001 From: fat Date: Thu, 14 Nov 2013 23:58:29 -0800 Subject: fixes #11477 and updates slid event in carousel with namespace --- dist/js/bootstrap.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 4798d309e..91fa987a5 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -351,7 +351,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" if (pos > (this.$items.length - 1) || pos < 0) return - if (this.sliding) return this.$element.one('slid', function () { that.to(pos) }) + if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) if (activeIndex == pos) return this.pause().cycle() return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) @@ -403,7 +403,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" if (this.$indicators.length) { this.$indicators.find('.active').removeClass('active') - this.$element.one('slid', function () { + this.$element.one('slid.bs.carousel', function () { var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) $nextIndicator && $nextIndicator.addClass('active') }) @@ -421,7 +421,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" $next.removeClass([type, direction].join(' ')).addClass('active') $active.removeClass(['active', direction].join(' ')) that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) + setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0) }) .emulateTransitionEnd(600) } else { @@ -430,7 +430,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" $active.removeClass('active') $next.addClass('active') this.sliding = false - this.$element.trigger('slid') + this.$element.trigger('slid.bs.carousel') } isCycling && this.cycle() @@ -1700,7 +1700,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .addClass('active') } - active.trigger('activate') + active.trigger('activate.bs.scrollspy') } -- cgit v1.2.3 From 9829c86f7ca5c76ef21892ec1198858eebc99392 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 26 Nov 2013 15:21:27 -0800 Subject: run grunt --- 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 91fa987a5..0d5c3e0c7 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -721,7 +721,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" if (!isActive) { if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { - // if mobile we we use a backdrop because click events don't delegate + // if mobile we use a backdrop because click events don't delegate $('
').insertAfter($(this)).on('click', clearMenus) } -- cgit v1.2.3 From 3d5e598e5c9bc4d0573266e9a0aa84f988683285 Mon Sep 17 00:00:00 2001 From: Tobias Lindig Date: Thu, 28 Nov 2013 18:40:15 +0100 Subject: add builded files from dist/ --- dist/js/bootstrap.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 0d5c3e0c7..cc1b839d2 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1,13 +1,13 @@ -/*! - * Bootstrap v3.0.2 by @fat and @mdo - * Copyright 2013 Twitter, Inc. - * Licensed under http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. - */ - -if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") } - +/*! + * Bootstrap v3.0.2 by @fat and @mdo + * Copyright 2013 Twitter, Inc. + * Licensed under http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world by @mdo and @fat. + */ + +if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") } + /* ======================================================================== * Bootstrap: transition.js v3.0.2 * http://getbootstrap.com/javascript/#transitions @@ -64,7 +64,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: alert.js v3.0.2 * http://getbootstrap.com/javascript/#alerts @@ -163,7 +163,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) }(jQuery); - + /* ======================================================================== * Bootstrap: button.js v3.0.2 * http://getbootstrap.com/javascript/#buttons @@ -279,7 +279,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: carousel.js v3.0.2 * http://getbootstrap.com/javascript/#carousel @@ -497,7 +497,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: collapse.js v3.0.2 * http://getbootstrap.com/javascript/#collapse @@ -677,7 +677,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: dropdown.js v3.0.2 * http://getbootstrap.com/javascript/#dropdowns @@ -832,7 +832,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(jQuery); - + /* ======================================================================== * Bootstrap: modal.js v3.0.2 * http://getbootstrap.com/javascript/#modals @@ -1079,7 +1079,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) }(jQuery); - + /* ======================================================================== * Bootstrap: tooltip.js v3.0.2 * http://getbootstrap.com/javascript/#tooltip @@ -1466,7 +1466,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } }(jQuery); - + /* ======================================================================== * Bootstrap: popover.js v3.0.2 * http://getbootstrap.com/javascript/#popovers @@ -1584,7 +1584,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } }(jQuery); - + /* ======================================================================== * Bootstrap: scrollspy.js v3.0.2 * http://getbootstrap.com/javascript/#scrollspy @@ -1743,7 +1743,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: tab.js v3.0.2 * http://getbootstrap.com/javascript/#tabs @@ -1879,7 +1879,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: affix.js v3.0.2 * http://getbootstrap.com/javascript/#affix -- cgit v1.2.3 From 594d0c700dacbce8805bab1be6111631c8e003fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 11:33:00 -0800 Subject: grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing --- dist/js/bootstrap.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index cc1b839d2..0d5c3e0c7 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1,13 +1,13 @@ -/*! - * Bootstrap v3.0.2 by @fat and @mdo - * Copyright 2013 Twitter, Inc. - * Licensed under http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. - */ - -if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") } - +/*! + * Bootstrap v3.0.2 by @fat and @mdo + * Copyright 2013 Twitter, Inc. + * Licensed under http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world by @mdo and @fat. + */ + +if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") } + /* ======================================================================== * Bootstrap: transition.js v3.0.2 * http://getbootstrap.com/javascript/#transitions @@ -64,7 +64,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: alert.js v3.0.2 * http://getbootstrap.com/javascript/#alerts @@ -163,7 +163,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) }(jQuery); - + /* ======================================================================== * Bootstrap: button.js v3.0.2 * http://getbootstrap.com/javascript/#buttons @@ -279,7 +279,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: carousel.js v3.0.2 * http://getbootstrap.com/javascript/#carousel @@ -497,7 +497,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: collapse.js v3.0.2 * http://getbootstrap.com/javascript/#collapse @@ -677,7 +677,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: dropdown.js v3.0.2 * http://getbootstrap.com/javascript/#dropdowns @@ -832,7 +832,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(jQuery); - + /* ======================================================================== * Bootstrap: modal.js v3.0.2 * http://getbootstrap.com/javascript/#modals @@ -1079,7 +1079,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) }(jQuery); - + /* ======================================================================== * Bootstrap: tooltip.js v3.0.2 * http://getbootstrap.com/javascript/#tooltip @@ -1466,7 +1466,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } }(jQuery); - + /* ======================================================================== * Bootstrap: popover.js v3.0.2 * http://getbootstrap.com/javascript/#popovers @@ -1584,7 +1584,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } }(jQuery); - + /* ======================================================================== * Bootstrap: scrollspy.js v3.0.2 * http://getbootstrap.com/javascript/#scrollspy @@ -1743,7 +1743,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: tab.js v3.0.2 * http://getbootstrap.com/javascript/#tabs @@ -1879,7 +1879,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }) }(jQuery); - + /* ======================================================================== * Bootstrap: affix.js v3.0.2 * http://getbootstrap.com/javascript/#affix -- cgit v1.2.3 From a7a9dcaeb2231b2580cf79fcee7d777b98ac24d8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 00:42:36 -0800 Subject: Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it --- dist/js/bootstrap.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index b7313f403..e04cd1f8d 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1,9 +1,7 @@ /*! - * Bootstrap v3.0.2 by @fat and @mdo + * Bootstrap v3.0.2 (http://getbootstrap.com) * Copyright 2013 Twitter, Inc. * Licensed under http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. */ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") } -- cgit v1.2.3 From 8a74264344489e8b9e10c5c5e2098bb75116b8bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Dec 2013 19:31:52 -0800 Subject: bump version numbers to 3.0.3 --- dist/js/bootstrap.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index e04cd1f8d..b7fef5f63 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.0.2 (http://getbootstrap.com) + * Bootstrap v3.0.3 (http://getbootstrap.com) * Copyright 2013 Twitter, Inc. * Licensed under http://www.apache.org/licenses/LICENSE-2.0 */ @@ -7,7 +7,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") } /* ======================================================================== - * Bootstrap: transition.js v3.0.2 + * Bootstrap: transition.js v3.0.3 * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -64,7 +64,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: alert.js v3.0.2 + * Bootstrap: alert.js v3.0.3 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -163,7 +163,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: button.js v3.0.2 + * Bootstrap: button.js v3.0.3 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -279,7 +279,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: carousel.js v3.0.2 + * Bootstrap: carousel.js v3.0.3 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -497,7 +497,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: collapse.js v3.0.2 + * Bootstrap: collapse.js v3.0.3 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -677,7 +677,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: dropdown.js v3.0.2 + * Bootstrap: dropdown.js v3.0.3 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -832,7 +832,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: modal.js v3.0.2 + * Bootstrap: modal.js v3.0.3 * http://getbootstrap.com/javascript/#modals * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1079,7 +1079,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: tooltip.js v3.0.2 + * Bootstrap: tooltip.js v3.0.3 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== @@ -1466,7 +1466,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: popover.js v3.0.2 + * Bootstrap: popover.js v3.0.3 * http://getbootstrap.com/javascript/#popovers * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1584,7 +1584,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: scrollspy.js v3.0.2 + * Bootstrap: scrollspy.js v3.0.3 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1743,7 +1743,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: tab.js v3.0.2 + * Bootstrap: tab.js v3.0.3 * http://getbootstrap.com/javascript/#tabs * ======================================================================== * Copyright 2013 Twitter, Inc. @@ -1879,7 +1879,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" }(jQuery); /* ======================================================================== - * Bootstrap: affix.js v3.0.2 + * Bootstrap: affix.js v3.0.3 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2013 Twitter, Inc. -- cgit v1.2.3 From a45d83987466e61fd613ac9e7f98fafa8697d16f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 4 Dec 2013 21:13:33 -0800 Subject: Fixes #11712: Better support for .table-responsive within .panel's --- 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 b7fef5f63..850e6e53b 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -704,7 +704,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" var backdrop = '.dropdown-backdrop' var toggle = '[data-toggle=dropdown]' var Dropdown = function (element) { - var $el = $(element).on('click.bs.dropdown', this.toggle) + $(element).on('click.bs.dropdown', this.toggle) } Dropdown.prototype.toggle = function (e) { -- cgit v1.2.3 From 4aad52797c9ec43c30561f481f595be178f6ab94 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 6 Dec 2013 12:20:59 +0200 Subject: Use a space after function consistently. --- dist/js/bootstrap.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 850e6e53b..183279907 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1272,7 +1272,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } } - Tooltip.prototype.applyPlacement = function(offset, placement) { + Tooltip.prototype.applyPlacement = function (offset, placement) { var replace var $tip = this.tip() var width = $tip[0].offsetWidth @@ -1323,7 +1323,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" if (replace) $tip.offset(offset) } - Tooltip.prototype.replaceArrow = function(delta, dimension, position) { + Tooltip.prototype.replaceArrow = function (delta, dimension, position) { this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') } -- cgit v1.2.3 From 2b4fa90902e9b911dafe76a7cd33f5bcb748a238 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 11:44:32 -0800 Subject: 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 183279907..d6b01e850 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -763,7 +763,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" if (e.keyCode == 38 && index > 0) index-- // up if (e.keyCode == 40 && index < $items.length - 1) index++ // down - if (!~index) index=0 + if (!~index) index = 0 $items.eq(index).focus() } @@ -1013,7 +1013,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } else if (!this.isShown && this.$backdrop) { this.$backdrop.removeClass('in') - $.support.transition && this.$element.hasClass('fade')? + $.support.transition && this.$element.hasClass('fade') ? this.$backdrop .one($.support.transition.end, callback) .emulateTransitionEnd(150) : @@ -1213,7 +1213,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } Tooltip.prototype.show = function () { - var e = $.Event('show.bs.'+ this.type) + var e = $.Event('show.bs.' + this.type) if (this.hasContent() && this.enabled) { this.$element.trigger(e) -- cgit v1.2.3 From eca8ff380388c1187bc2c86e0ae7fa80aa33111e Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 18 Sep 2013 19:50:02 +0300 Subject: Use single quotes consistently. --- dist/js/bootstrap.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'dist/js/bootstrap.js') diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index d6b01e850..dfa3d4e24 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -26,7 +26,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) // ============================================================ @@ -83,7 +83,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // ALERT CLASS DEFINITION // ====================== @@ -182,7 +182,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // BUTTON PUBLIC CLASS DEFINITION // ============================== @@ -298,7 +298,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // CAROUSEL CLASS DEFINITION // ========================= @@ -516,7 +516,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // COLLAPSE PUBLIC CLASS DEFINITION // ================================ @@ -696,7 +696,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // DROPDOWN CLASS DEFINITION // ========================= @@ -851,7 +851,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // MODAL CLASS DEFINITION // ====================== @@ -1099,7 +1099,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // TOOLTIP PUBLIC CLASS DEFINITION // =============================== @@ -1324,7 +1324,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } Tooltip.prototype.replaceArrow = function (delta, dimension, position) { - this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '') } Tooltip.prototype.setContent = function () { @@ -1485,7 +1485,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // POPOVER PUBLIC CLASS DEFINITION // =============================== @@ -1603,7 +1603,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // SCROLLSPY CLASS DEFINITION // ========================== @@ -1762,7 +1762,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // TAB CLASS DEFINITION // ==================== @@ -1898,7 +1898,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // AFFIX CLASS DEFINITION // ====================== -- cgit v1.2.3