From 2ae5fdf9ddbff98c55e47b81d7150b8d960ad342 Mon Sep 17 00:00:00 2001 From: Bernardo Gurgel Filho Date: Sun, 23 Aug 2015 01:59:48 -0300 Subject: Convert tooltip's arrows to generated CSS content via :before --- js/src/tooltip.js | 1 - 1 file changed, 1 deletion(-) (limited to 'js/src') diff --git a/js/src/tooltip.js b/js/src/tooltip.js index aa5c73945..099a47482 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -28,7 +28,6 @@ const Tooltip = (($) => { const Default = { animation : true, template : '', trigger : 'hover focus', title : '', -- cgit v1.2.3 From 8ef66df6d793afbda487c1a4505d0a6576252ec4 Mon Sep 17 00:00:00 2001 From: Bernardo Gurgel Filho Date: Sun, 23 Aug 2015 17:54:38 -0300 Subject: Convert popover's arrows to generated CSS content via :before/:after --- js/src/popover.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'js/src') diff --git a/js/src/popover.js b/js/src/popover.js index 99e48e64f..6ea8b00fb 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -28,7 +28,6 @@ const Popover = (($) => { trigger : 'click', content : '', template : '' }) @@ -44,8 +43,7 @@ const Popover = (($) => { const Selector = { TITLE : '.popover-title', - CONTENT : '.popover-content', - ARROW : '.popover-arrow' + CONTENT : '.popover-content' } const Event = { -- cgit v1.2.3 From 32f9a5d6a594aaa4afd62b2410b45804edb737c5 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Fri, 11 Sep 2015 10:45:08 +0200 Subject: fix resetting style on closing collapse --- js/src/collapse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src') diff --git a/js/src/collapse.js b/js/src/collapse.js index e46d3ec60..d95d6f28e 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -235,7 +235,7 @@ const Collapse = (($) => { .trigger(Event.HIDDEN) } - this._element.style[dimension] = 0 + this._element.style[dimension] = '' if (!Util.supportsTransitionEnd()) { complete() -- cgit v1.2.3 From 6d451ad99d02ed60ced937901a9d8b8323999af3 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Wed, 16 Sep 2015 09:46:55 +0200 Subject: Change destroy -> dispose --- js/src/tooltip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src') diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 151cd6f51..55b9d5898 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -612,7 +612,7 @@ const Tooltip = (($) => { let _config = typeof config === 'object' ? config : null - if (!data && /destroy|hide/.test(config)) { + if (!data && /dispose|hide/.test(config)) { return } -- cgit v1.2.3 From 4d1b9d7ce7adcb3a16b81cb3561d5294f50d3c3a Mon Sep 17 00:00:00 2001 From: akai Date: Thu, 19 May 2016 04:53:01 +0800 Subject: Remove stray "~" in modal paddingRight value (#19932) [skip validator] --- js/src/modal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src') diff --git a/js/src/modal.js b/js/src/modal.js index 695ac569b..f52af09a2 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -400,7 +400,7 @@ const Modal = (($) => { } if (this._isBodyOverflowing && !isModalOverflowing) { - this._element.style.paddingRight = `${this._scrollbarWidth}px~` + this._element.style.paddingRight = `${this._scrollbarWidth}px` } } -- cgit v1.2.3 From 5a35ad6d74c8d9e5aa99a1fc255300a8fd2ac0b4 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 30 May 2016 23:42:00 -0700 Subject: Use named constants for magic numbers (#19992) Mostly KeyboardEvent.which and MouseEvent.which values. [skip validator] --- js/src/carousel.js | 6 ++++-- js/src/dropdown.js | 28 ++++++++++++++++------------ js/src/modal.js | 3 ++- js/src/util.js | 4 +++- 4 files changed, 25 insertions(+), 16 deletions(-) (limited to 'js/src') diff --git a/js/src/carousel.js b/js/src/carousel.js index 34cab4391..f990c699a 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -24,6 +24,8 @@ const Carousel = (($) => { const DATA_API_KEY = '.data-api' const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 600 + const ARROW_LEFT_KEYCODE = 37 // KeyboardEvent.which value for left arrow key + const ARROW_RIGHT_KEYCODE = 39 // KeyboardEvent.which value for right arrow key const Default = { interval : 5000, @@ -236,8 +238,8 @@ const Carousel = (($) => { } switch (event.which) { - case 37: this.prev(); break - case 39: this.next(); break + case ARROW_LEFT_KEYCODE: this.prev(); break + case ARROW_RIGHT_KEYCODE: this.next(); break default: return } } diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 92f841bc4..b2da8f4e4 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -17,12 +17,16 @@ const Dropdown = (($) => { * ------------------------------------------------------------------------ */ - const NAME = 'dropdown' - const VERSION = '4.0.0-alpha.2' - const DATA_KEY = 'bs.dropdown' - const EVENT_KEY = `.${DATA_KEY}` - const DATA_API_KEY = '.data-api' - const JQUERY_NO_CONFLICT = $.fn[NAME] + const NAME = 'dropdown' + const VERSION = '4.0.0-alpha.2' + const DATA_KEY = 'bs.dropdown' + const EVENT_KEY = `.${DATA_KEY}` + const DATA_API_KEY = '.data-api' + const JQUERY_NO_CONFLICT = $.fn[NAME] + const ESCAPE_KEYCODE = 27 // KeyboardEvent.which value for Escape (Esc) key + const ARROW_UP_KEYCODE = 38 // KeyboardEvent.which value for up arrow key + const ARROW_DOWN_KEYCODE = 40 // KeyboardEvent.which value for down arrow key + const RIGHT_MOUSE_BUTTON_WHICH = 3 // MouseEvent.which value for the right button (assuming a right-handed mouse) const Event = { HIDE : `hide${EVENT_KEY}`, @@ -152,7 +156,7 @@ const Dropdown = (($) => { } static _clearMenus(event) { - if (event && event.which === 3) { + if (event && event.which === RIGHT_MOUSE_BUTTON_WHICH) { return } @@ -218,10 +222,10 @@ const Dropdown = (($) => { let parent = Dropdown._getParentFromElement(this) let isActive = $(parent).hasClass(ClassName.OPEN) - if ((!isActive && event.which !== 27) || - (isActive && event.which === 27)) { + if ((!isActive && event.which !== ESCAPE_KEYCODE) || + (isActive && event.which === ESCAPE_KEYCODE)) { - if (event.which === 27) { + if (event.which === ESCAPE_KEYCODE) { let toggle = $(parent).find(Selector.DATA_TOGGLE)[0] $(toggle).trigger('focus') } @@ -242,11 +246,11 @@ const Dropdown = (($) => { let index = items.indexOf(event.target) - if (event.which === 38 && index > 0) { // up + if (event.which === ARROW_UP_KEYCODE && index > 0) { // up index-- } - if (event.which === 40 && index < items.length - 1) { // down + if (event.which === ARROW_DOWN_KEYCODE && index < items.length - 1) { // down index++ } diff --git a/js/src/modal.js b/js/src/modal.js index f52af09a2..2f26bc0d9 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -25,6 +25,7 @@ const Modal = (($) => { const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 300 const BACKDROP_TRANSITION_DURATION = 150 + const ESCAPE_KEYCODE = 27 // Escape (Esc) key const Default = { backdrop : true, @@ -271,7 +272,7 @@ const Modal = (($) => { _setEscapeEvent() { if (this._isShown && this._config.keyboard) { $(this._element).on(Event.KEYDOWN_DISMISS, (event) => { - if (event.which === 27) { + if (event.which === ESCAPE_KEYCODE) { this.hide() } }) diff --git a/js/src/util.js b/js/src/util.js index dba6e9bd6..070c5ea75 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -16,6 +16,8 @@ const Util = (($) => { let transition = false + const MAX_UID = 1000000 + const TransitionEndEvent = { WebkitTransition : 'webkitTransitionEnd', MozTransition : 'transitionend', @@ -100,7 +102,7 @@ const Util = (($) => { getUID(prefix) { do { /* eslint-disable no-bitwise */ - prefix += ~~(Math.random() * 1000000) // "~~" acts like a faster Math.floor() here + prefix += ~~(Math.random() * MAX_UID) // "~~" acts like a faster Math.floor() here /* eslint-enable no-bitwise */ } while (document.getElementById(prefix)) return prefix -- cgit v1.2.3 From c4add0c2f30b8404bd1d227b16d7668a236c1d63 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 31 May 2016 00:45:32 -0700 Subject: Comply with consistent-return ESLint rule --- js/src/scrollspy.js | 1 + js/src/util.js | 1 + 2 files changed, 2 insertions(+) (limited to 'js/src') diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index b9186db00..001f7f56c 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -140,6 +140,7 @@ const ScrollSpy = (($) => { targetSelector ] } + return null }) .filter((item) => item) .sort((a, b) => a[0] - b[0]) diff --git a/js/src/util.js b/js/src/util.js index 070c5ea75..b779c448f 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -42,6 +42,7 @@ const Util = (($) => { if ($(event.target).is(this)) { return event.handleObj.handler.apply(this, arguments) } + return undefined } } } -- cgit v1.2.3 From 5dcd1a743dfdca0464099bc52fe4675fdff25924 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 31 May 2016 02:19:56 -0700 Subject: Tweak Esc key comment in modal.js [skip sauce] [skip validator] --- js/src/modal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src') diff --git a/js/src/modal.js b/js/src/modal.js index 2f26bc0d9..bf0a7608f 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -25,7 +25,7 @@ const Modal = (($) => { const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 300 const BACKDROP_TRANSITION_DURATION = 150 - const ESCAPE_KEYCODE = 27 // Escape (Esc) key + const ESCAPE_KEYCODE = 27 // KeyboardEvent.which value for Escape (Esc) key const Default = { backdrop : true, -- cgit v1.2.3 From 2b16f5c5100c8a42bccad028903eadac2875e20c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 14:28:34 -0700 Subject: Update ESLint to v2.5.3 (#20043) Refs #19908. [skip sauce] [skip validator] --- js/src/carousel.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'js/src') diff --git a/js/src/carousel.js b/js/src/carousel.js index f990c699a..e24aed08f 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -238,9 +238,14 @@ const Carousel = (($) => { } switch (event.which) { - case ARROW_LEFT_KEYCODE: this.prev(); break - case ARROW_RIGHT_KEYCODE: this.next(); break - default: return + case ARROW_LEFT_KEYCODE: + this.prev() + break + case ARROW_RIGHT_KEYCODE: + this.next() + break + default: + return } } -- cgit v1.2.3 From c955868982e6a6647fa3b722bf42f73f6d513f79 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 5 Jun 2016 11:17:05 -0700 Subject: Enable more rules from ESLint 2.0; refs #19999 (#20076) [skip sauce] [skip validator] --- js/src/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src') diff --git a/js/src/util.js b/js/src/util.js index b779c448f..86d9fe1f4 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -40,7 +40,7 @@ const Util = (($) => { delegateType: transition.end, handle(event) { if ($(event.target).is(this)) { - return event.handleObj.handler.apply(this, arguments) + return event.handleObj.handler.apply(this, arguments) // eslint-disable-line prefer-rest-params } return undefined } -- cgit v1.2.3 From 24e992a6ffbb3b54424eb1042d49005124b265d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Jul 2016 09:31:24 -0700 Subject: bump versions --- js/src/alert.js | 4 ++-- js/src/button.js | 4 ++-- js/src/carousel.js | 4 ++-- js/src/collapse.js | 4 ++-- js/src/dropdown.js | 4 ++-- js/src/modal.js | 4 ++-- js/src/popover.js | 4 ++-- js/src/scrollspy.js | 4 ++-- js/src/tab.js | 4 ++-- js/src/tooltip.js | 4 ++-- js/src/util.js | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) (limited to 'js/src') diff --git a/js/src/alert.js b/js/src/alert.js index 4cb006ea3..a4e7f56a5 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): alert.js + * Bootstrap (v4.0.0-alpha.3): alert.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Alert = (($) => { */ const NAME = 'alert' - const VERSION = '4.0.0-alpha.2' + const VERSION = '4.0.0-alpha.3' const DATA_KEY = 'bs.alert' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/button.js b/js/src/button.js index 39e2b3974..14f3c569f 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): button.js + * Bootstrap (v4.0.0-alpha.3): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ const Button = (($) => { */ const NAME = 'button' - const VERSION = '4.0.0-alpha.2' + const VERSION = '4.0.0-alpha.3' const DATA_KEY = 'bs.button' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/carousel.js b/js/src/carousel.js index e24aed08f..e2a6537bf 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): carousel.js + * Bootstrap (v4.0.0-alpha.3): carousel.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Carousel = (($) => { */ const NAME = 'carousel' - const VERSION = '4.0.0-alpha.2' + const VERSION = '4.0.0-alpha.3' const DATA_KEY = 'bs.carousel' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/collapse.js b/js/src/collapse.js index 3dd07cadf..d99b384d1 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): collapse.js + * Bootstrap (v4.0.0-alpha.3): collapse.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Collapse = (($) => { */ const NAME = 'collapse' - const VERSION = '4.0.0-alpha.2' + const VERSION = '4.0.0-alpha.3' const DATA_KEY = 'bs.collapse' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/dropdown.js b/js/src/dropdown.js index b2da8f4e4..e0f4a1822 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): dropdown.js + * Bootstrap (v4.0.0-alpha.3): dropdown.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Dropdown = (($) => { */ const NAME = 'dropdown' - const VERSION = '4.0.0-alpha.2' + const VERSION = '4.0.0-alpha.3' const DATA_KEY = 'bs.dropdown' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/modal.js b/js/src/modal.js index bf0a7608f..9b3a99ddd 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): modal.js + * Bootstrap (v4.0.0-alpha.3): modal.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Modal = (($) => { */ const NAME = 'modal' - const VERSION = '4.0.0-alpha.2' + const VERSION = '4.0.0-alpha.3' const DATA_KEY = 'bs.modal' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/popover.js b/js/src/popover.js index 7e8ec4297..e4c32637b 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -3,7 +3,7 @@ import Tooltip from './tooltip' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): popover.js + * Bootstrap (v4.0.0-alpha.3): popover.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Popover = (($) => { */ const NAME = 'popover' - const VERSION = '4.0.0-alpha.2' + const VERSION = '4.0.0-alpha.3' const DATA_KEY = 'bs.popover' const EVENT_KEY = `.${DATA_KEY}` const JQUERY_NO_CONFLICT = $.fn[NAME] diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index 001f7f56c..52b8b6d20 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): scrollspy.js + * Bootstrap (v4.0.0-alpha.3): scrollspy.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const ScrollSpy = (($) => { */ const NAME = 'scrollspy' - const VERSION = '4.0.0-alpha.2' + const VERSION = '4.0.0-alpha.3' const DATA_KEY = 'bs.scrollspy' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/tab.js b/js/src/tab.js index 33f56faae..7bd8f2f9c 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): tab.js + * Bootstrap (v4.0.0-alpha.3): tab.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Tab = (($) => { */ const NAME = 'tab' - const VERSION = '4.0.0-alpha.2' + const VERSION = '4.0.0-alpha.3' const DATA_KEY = 'bs.tab' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 77803dc40..0b3ba3669 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -5,7 +5,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): tooltip.js + * Bootstrap (v4.0.0-alpha.3): tooltip.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ const Tooltip = (($) => { */ const NAME = 'tooltip' - const VERSION = '4.0.0-alpha.2' + const VERSION = '4.0.0-alpha.3' const DATA_KEY = 'bs.tooltip' const EVENT_KEY = `.${DATA_KEY}` const JQUERY_NO_CONFLICT = $.fn[NAME] diff --git a/js/src/util.js b/js/src/util.js index 86d9fe1f4..051555268 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): util.js + * Bootstrap (v4.0.0-alpha.3): util.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ -- cgit v1.2.3 From 5495a4b3d383c745065a177d3adb8e5db94acd7f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Sep 2016 12:41:44 -0700 Subject: versions --- js/src/alert.js | 4 ++-- js/src/button.js | 4 ++-- js/src/carousel.js | 4 ++-- js/src/collapse.js | 4 ++-- js/src/dropdown.js | 4 ++-- js/src/modal.js | 4 ++-- js/src/popover.js | 4 ++-- js/src/scrollspy.js | 4 ++-- js/src/tab.js | 4 ++-- js/src/tooltip.js | 4 ++-- js/src/util.js | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) (limited to 'js/src') diff --git a/js/src/alert.js b/js/src/alert.js index a4e7f56a5..cff86dcdd 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): alert.js + * Bootstrap (v4.0.0-alpha.4): alert.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Alert = (($) => { */ const NAME = 'alert' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.4' const DATA_KEY = 'bs.alert' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/button.js b/js/src/button.js index 14f3c569f..24b0cd414 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): button.js + * Bootstrap (v4.0.0-alpha.4): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ const Button = (($) => { */ const NAME = 'button' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.4' const DATA_KEY = 'bs.button' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/carousel.js b/js/src/carousel.js index e2a6537bf..ff00d8aaf 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): carousel.js + * Bootstrap (v4.0.0-alpha.4): carousel.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Carousel = (($) => { */ const NAME = 'carousel' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.4' const DATA_KEY = 'bs.carousel' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/collapse.js b/js/src/collapse.js index d99b384d1..f4b89c37b 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): collapse.js + * Bootstrap (v4.0.0-alpha.4): collapse.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Collapse = (($) => { */ const NAME = 'collapse' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.4' const DATA_KEY = 'bs.collapse' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/dropdown.js b/js/src/dropdown.js index e0f4a1822..e38792d3b 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): dropdown.js + * Bootstrap (v4.0.0-alpha.4): dropdown.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Dropdown = (($) => { */ const NAME = 'dropdown' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.4' const DATA_KEY = 'bs.dropdown' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/modal.js b/js/src/modal.js index 9b3a99ddd..ebd3e4a34 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): modal.js + * Bootstrap (v4.0.0-alpha.4): modal.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Modal = (($) => { */ const NAME = 'modal' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.4' const DATA_KEY = 'bs.modal' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/popover.js b/js/src/popover.js index e4c32637b..7ea560812 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -3,7 +3,7 @@ import Tooltip from './tooltip' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): popover.js + * Bootstrap (v4.0.0-alpha.4): popover.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Popover = (($) => { */ const NAME = 'popover' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.4' const DATA_KEY = 'bs.popover' const EVENT_KEY = `.${DATA_KEY}` const JQUERY_NO_CONFLICT = $.fn[NAME] diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index 52b8b6d20..a664090fb 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): scrollspy.js + * Bootstrap (v4.0.0-alpha.4): scrollspy.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const ScrollSpy = (($) => { */ const NAME = 'scrollspy' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.4' const DATA_KEY = 'bs.scrollspy' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/tab.js b/js/src/tab.js index 7bd8f2f9c..bf059d367 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): tab.js + * Bootstrap (v4.0.0-alpha.4): tab.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Tab = (($) => { */ const NAME = 'tab' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.4' const DATA_KEY = 'bs.tab' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 0b3ba3669..08daae2f2 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -5,7 +5,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): tooltip.js + * Bootstrap (v4.0.0-alpha.4): tooltip.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ const Tooltip = (($) => { */ const NAME = 'tooltip' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.4' const DATA_KEY = 'bs.tooltip' const EVENT_KEY = `.${DATA_KEY}` const JQUERY_NO_CONFLICT = $.fn[NAME] diff --git a/js/src/util.js b/js/src/util.js index 051555268..d117dfcd5 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): util.js + * Bootstrap (v4.0.0-alpha.4): util.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ -- cgit v1.2.3 From 2e69dfa8c1679238579ef6f5ec85deb755e4fb6d Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Tue, 4 Oct 2016 02:55:59 +1000 Subject: Fix broken/redirected links, moving to HTTPS where possible. (#20557) --- js/src/tooltip.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/src') diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 08daae2f2..d012b2907 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -14,10 +14,10 @@ const Tooltip = (($) => { /** * Check for Tether dependency - * Tether - http://github.hubspot.com/tether/ + * Tether - http://tether.io/ */ if (window.Tether === undefined) { - throw new Error('Bootstrap tooltips require Tether (http://github.hubspot.com/tether/)') + throw new Error('Bootstrap tooltips require Tether (http://tether.io/)') } -- cgit v1.2.3 From de1255b14e9d1bbfc1a3b055477f4fc15cc974af Mon Sep 17 00:00:00 2001 From: Johann-S Date: Tue, 1 Dec 2015 23:17:35 +0100 Subject: Collapse using card component --- js/src/collapse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src') diff --git a/js/src/collapse.js b/js/src/collapse.js index 3fb0245e7..560ab2cbd 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -56,7 +56,7 @@ const Collapse = (($) => { } const Selector = { - ACTIVES : '.panel > .in, .panel > .collapsing', + ACTIVES : '.card > .in, .card > .collapsing', DATA_TOGGLE : '[data-toggle="collapse"]' } -- cgit v1.2.3