From 8cfbf6933b8a0146ac3fbc369f19e520bd1ebdac Mon Sep 17 00:00:00 2001 From: Martijn Cuppens <martijn.cuppens@gmail.com> Date: Wed, 21 Feb 2018 09:01:02 +0100 Subject: [PATCH] Consistent usage of $(document.body) instead of $('body') (#25671) --- js/src/dropdown.js | 4 ++-- js/src/modal.js | 8 ++++---- js/src/tooltip.js | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/js/src/dropdown.js b/js/src/dropdown.js index b877017f2b..2f69298540 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -183,7 +183,7 @@ const Dropdown = (($) => { // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html if ('ontouchstart' in document.documentElement && $(parent).closest(Selector.NAVBAR_NAV).length === 0) { - $('body').children().on('mouseover', null, $.noop) + $(document.body).children().on('mouseover', null, $.noop) } this._element.focus() @@ -365,7 +365,7 @@ const Dropdown = (($) => { // If this is a touch-enabled device we remove the extra // empty mouseover listeners we added for iOS support if ('ontouchstart' in document.documentElement) { - $('body').children().off('mouseover', null, $.noop) + $(document.body).children().off('mouseover', null, $.noop) } toggles[i].setAttribute('aria-expanded', 'false') diff --git a/js/src/modal.js b/js/src/modal.js index 9237944df6..2ca56e7e2e 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -453,8 +453,8 @@ const Modal = (($) => { // Adjust body padding const actualPadding = document.body.style.paddingRight - const calculatedPadding = $('body').css('padding-right') - $('body').data('padding-right', actualPadding).css('padding-right', `${parseFloat(calculatedPadding) + this._scrollbarWidth}px`) + const calculatedPadding = $(document.body).css('padding-right') + $(document.body).data('padding-right', actualPadding).css('padding-right', `${parseFloat(calculatedPadding) + this._scrollbarWidth}px`) } } @@ -476,9 +476,9 @@ const Modal = (($) => { }) // Restore body padding - const padding = $('body').data('padding-right') + const padding = $(document.body).data('padding-right') if (typeof padding !== 'undefined') { - $('body').css('padding-right', padding).removeData('padding-right') + $(document.body).css('padding-right', padding).removeData('padding-right') } } diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 65d9c2201c..861f45a86a 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -317,7 +317,7 @@ const Tooltip = (($) => { // only needed because of broken event delegation on iOS // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html if ('ontouchstart' in document.documentElement) { - $('body').children().on('mouseover', null, $.noop) + $(document.body).children().on('mouseover', null, $.noop) } const complete = () => { @@ -375,7 +375,7 @@ const Tooltip = (($) => { // If this is a touch-enabled device we remove the extra // empty mouseover listeners we added for iOS support if ('ontouchstart' in document.documentElement) { - $('body').children().off('mouseover', null, $.noop) + $(document.body).children().off('mouseover', null, $.noop) } this._activeTrigger[Trigger.CLICK] = false -- GitLab