diff options
| author | Mark Otto <[email protected]> | 2015-01-19 09:03:09 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-19 09:03:09 -0800 |
| commit | bcf7dd38b5ab180256e2e4fb5da0369551b3f082 (patch) | |
| tree | ea515d40d74f6a9414c1dbdcee97b90c615e1d15 /js | |
| parent | ce29def7a63c86f238d725ef5b7a284c054d28a6 (diff) | |
| parent | fa47de717eb32f044d012974aa72a0c0ad0441e1 (diff) | |
| download | bootstrap-3.3.2.tar.xz bootstrap-3.3.2.zip | |
Merge pull request #15604 from twbs/ship_v3.3.2v3.3.2
Ship v3.3.2
Diffstat (limited to 'js')
| -rw-r--r-- | js/affix.js | 4 | ||||
| -rw-r--r-- | js/alert.js | 4 | ||||
| -rw-r--r-- | js/button.js | 4 | ||||
| -rw-r--r-- | js/carousel.js | 4 | ||||
| -rw-r--r-- | js/collapse.js | 4 | ||||
| -rw-r--r-- | js/dropdown.js | 4 | ||||
| -rw-r--r-- | js/modal.js | 4 | ||||
| -rw-r--r-- | js/popover.js | 4 | ||||
| -rw-r--r-- | js/scrollspy.js | 4 | ||||
| -rw-r--r-- | js/tab.js | 4 | ||||
| -rw-r--r-- | js/tooltip.js | 4 | ||||
| -rw-r--r-- | js/transition.js | 2 |
12 files changed, 23 insertions, 23 deletions
diff --git a/js/affix.js b/js/affix.js index 1f067342c..aaebc8c0f 100644 --- a/js/affix.js +++ b/js/affix.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: affix.js v3.3.1 + * Bootstrap: affix.js v3.3.2 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -28,7 +28,7 @@ this.checkPosition() } - Affix.VERSION = '3.3.1' + Affix.VERSION = '3.3.2' Affix.RESET = 'affix affix-top affix-bottom' diff --git a/js/alert.js b/js/alert.js index 1ba3a44e1..e8212caf0 100644 --- a/js/alert.js +++ b/js/alert.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: alert.js v3.3.1 + * Bootstrap: alert.js v3.3.2 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -18,7 +18,7 @@ $(el).on('click', dismiss, this.close) } - Alert.VERSION = '3.3.1' + Alert.VERSION = '3.3.2' Alert.TRANSITION_DURATION = 150 diff --git a/js/button.js b/js/button.js index 2d71f350b..4d5690173 100644 --- a/js/button.js +++ b/js/button.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: button.js v3.3.1 + * Bootstrap: button.js v3.3.2 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -19,7 +19,7 @@ this.isLoading = false } - Button.VERSION = '3.3.1' + Button.VERSION = '3.3.2' Button.DEFAULTS = { loadingText: 'loading...' diff --git a/js/carousel.js b/js/carousel.js index 468a78d59..450e1812e 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: carousel.js v3.3.1 + * Bootstrap: carousel.js v3.3.2 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -30,7 +30,7 @@ .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) } - Carousel.VERSION = '3.3.1' + Carousel.VERSION = '3.3.2' Carousel.TRANSITION_DURATION = 600 diff --git a/js/collapse.js b/js/collapse.js index 8ffa1e708..2bc30e7ba 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: collapse.js v3.3.1 + * Bootstrap: collapse.js v3.3.2 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -28,7 +28,7 @@ if (this.options.toggle) this.toggle() } - Collapse.VERSION = '3.3.1' + Collapse.VERSION = '3.3.2' Collapse.TRANSITION_DURATION = 350 diff --git a/js/dropdown.js b/js/dropdown.js index 980424d63..200e1c67b 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: dropdown.js v3.3.1 + * Bootstrap: dropdown.js v3.3.2 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -19,7 +19,7 @@ $(element).on('click.bs.dropdown', this.toggle) } - Dropdown.VERSION = '3.3.1' + Dropdown.VERSION = '3.3.2' Dropdown.prototype.toggle = function (e) { var $this = $(this) diff --git a/js/modal.js b/js/modal.js index 6be32fcd8..e7704b8fc 100644 --- a/js/modal.js +++ b/js/modal.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: modal.js v3.3.1 + * Bootstrap: modal.js v3.3.2 * http://getbootstrap.com/javascript/#modals * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -30,7 +30,7 @@ } } - Modal.VERSION = '3.3.1' + Modal.VERSION = '3.3.2' Modal.TRANSITION_DURATION = 300 Modal.BACKDROP_TRANSITION_DURATION = 150 diff --git a/js/popover.js b/js/popover.js index 034d6efd9..be65b11a1 100644 --- a/js/popover.js +++ b/js/popover.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: popover.js v3.3.1 + * Bootstrap: popover.js v3.3.2 * http://getbootstrap.com/javascript/#popovers * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -19,7 +19,7 @@ if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') - Popover.VERSION = '3.3.1' + Popover.VERSION = '3.3.2' Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { placement: 'right', diff --git a/js/scrollspy.js b/js/scrollspy.js index 20a3e4060..0987177fd 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: scrollspy.js v3.3.1 + * Bootstrap: scrollspy.js v3.3.2 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -30,7 +30,7 @@ this.process() } - ScrollSpy.VERSION = '3.3.1' + ScrollSpy.VERSION = '3.3.2' ScrollSpy.DEFAULTS = { offset: 10 @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tab.js v3.3.1 + * Bootstrap: tab.js v3.3.2 * http://getbootstrap.com/javascript/#tabs * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -17,7 +17,7 @@ this.element = $(element) } - Tab.VERSION = '3.3.1' + Tab.VERSION = '3.3.2' Tab.TRANSITION_DURATION = 150 diff --git a/js/tooltip.js b/js/tooltip.js index f9adb81ef..1856df598 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.3.1 + * Bootstrap: tooltip.js v3.3.2 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== @@ -25,7 +25,7 @@ this.init('tooltip', element, options) } - Tooltip.VERSION = '3.3.1' + Tooltip.VERSION = '3.3.2' Tooltip.TRANSITION_DURATION = 150 diff --git a/js/transition.js b/js/transition.js index 1853b5f2e..ec9ab6824 100644 --- a/js/transition.js +++ b/js/transition.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: transition.js v3.3.1 + * Bootstrap: transition.js v3.3.2 * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2011-2015 Twitter, Inc. |
