Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
701c6c6e
Unverified
Commit
701c6c6e
authored
4 years ago
by
XhmikosR
Committed by
GitHub
4 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Unbreak lines. (#32304)
parent
f05d6422
main
cleanup-floating-forms
cssvar-function
dependabot/npm_and_yarn/stylelint-and-stylelint-config-twbs-bootstrap-15.3.0
extend-snippets
floating-always-visible
floating-labels-icons
fod-main-banner
github/fork/719media/patch-13
github/fork/719media/patch-14
github/fork/719media/patch-9
github/fork/ChellyAhmed/fix-typo-reboot.md
github/fork/ChellyAhmed/offcanvas-scroll-back
github/fork/CtrlAltLilith/main
github/fork/Elysiome/offcanvas-optional-window-resizing
github/fork/JanSargsyan/main
github/fork/LunicLynx/support-different-line-height-for-buttons
github/fork/Psixodelik/main
github/fork/Ronid1/ronid1/offcanvas_static_backdrop
github/fork/RyanBerliner/tooltip-accessibility
github/fork/SantiagoPVazquez/Feature-default-border-bottom-to-dropdown-item
github/fork/Sir-Genius/utils
github/fork/Sumit-Singh-8/main
github/fork/Viktor-VERA2020/offcanvas-slide
github/fork/Zivangu9/input-group-for-form-control-plaintext
github/fork/alpadev/alpadev/call-dispose-on-component-reinstantiation
github/fork/astagi/fix/tree-shake-modules
github/fork/compnerd/dark-accordion-icon
github/fork/derSascha/dropdown-dont-close-on-input-click
github/fork/dev-ph1l/main
github/fork/donquixote/issue-33861-utl-mixin
github/fork/florianlacreuse/mixin-make-row-gutter-y
github/fork/gregorw/main
github/fork/iteggmbh/transitionend-dispose-race
github/fork/jdelStrother/patch-1
github/fork/jonnysp/form-floating
github/fork/jonnysp/independent-offcanvas
github/fork/jonnysp/theme-dark-on-card-and-modal-fix
github/fork/josefdlange/floating-label-placeholder-opacity
github/fork/julien-deramond/enhance-change-version.js
github/fork/julien-deramond/main-jd-fix-offset-content
github/fork/julien-deramond/main-jd-issue-with-utitlies
github/fork/julien-deramond/main-xmr-pa11y-ci-jd-add-hideElements
github/fork/kyletsang/fix-tooltip-padding
github/fork/lacutah/CheckboxCenteringDocumentation
github/fork/lekoala/patch-3
github/fork/louismaximepiton/main-kld-lmp-collapse-proposal
github/fork/louismaximepiton/main-lmp-card-inner-border-radius-fix
github/fork/louismaximepiton/main-lmp-carousel-multiple-images
github/fork/louismaximepiton/main-lmp-css-var-init
github/fork/louismaximepiton/main-lmp-disabled-floating-label-fix
github/fork/louismaximepiton/main-lmp-input-range-fix
github/fork/louismaximepiton/main-lmp-shift-color
github/fork/louismaximepiton/main-lmp-table-active-tr-fix
github/fork/maciek-szn/switch
github/fork/michael-roth/feature/19964-multiple-tab-targets
github/fork/mistic100/dom-utils
github/fork/nkdas91/accordion
github/fork/nstungcom/fix-missing-modal-open-class
github/fork/oraliahdz/animation-utilities
github/fork/pine3ree/patch-7
github/fork/pouwerkerk/unindent-scss-docs-shortcode
github/fork/smares/smares-no-scolling-on-modal-close
github/fork/tgm-git/patch-1
gs-forms
gs-toasts-with-animated-progress-bar
gs/add-history-helper
gs/change-version-dir-on-docs
gs/data-must-set-onlu-one-instance
gs/docs/fix-drop-down-error
gs/event-handler-2
gs/make-docs-js-build
gs/make-simple-attribute-toggler
gs/popover-fix-doc
gs/provide-steConfig-method
gs/scrollspy-smoothscroll-option-use-browser-history
gs/streamline-jqueryInterface
gs/support-drop-down-in-navbar
gs/test-js-generic-trigger
gs/try-web-components
gs/tweak-collapse-js-selector
gs/use-event-handler-in-cocmponent
gs/use-rollup-replace-for-version
jo-docs-thanks-page
jo-ssr-friendly
logical-props-spacing-utils
main-fod-disabled-form-check-label
main-fod-nested-accordion
main-fod-simpler-table-structure
main-fod-table-separator
main-fod-utilities-contrast
main-jd-abbr-title
main-jd-add-chips
main-jd-add-doc-for-sass-custom-colors
main-jd-add-enable-host-to-handle-web-components
main-jd-browserstack-fine-tune
main-jd-browserstack-updates
main-jd-docs-consistent-usage-of-css-sections-step-2
main-jd-fix-docs-headers-in-white
main-jd-fix-highlight-docs-border-radius
main-jd-fix-placeholder-color-background-params-for-img-markup
main-jd-glossary-experiment
main-jd-postcss-drop-empty-css-vars
main-jd-proto-doc-astro
main-jd-skip-navigation-component
main-jd-stackblitz-for-examples
main-jd-upgrade-browserlistrc
main-jd-use-host
main-lmp-dark-theme-customization
main-lmp-handle-scroll-target
main-lmp-tab-fix
main-mc-opensearch
main-xmr-bundlewatch-action
main-xmr-eslint-plugin-compat
main-xmr-hugo-docs-vendor
main-xmr-hugo-rm-ver
main-xmr-linkinator-prod
main-xmr-min-mangle
main-xmr-pa11y-ci
more-darkmode-examples
nested-dropdowns
patrickhlauke-issue37428
patrickhlauke-use-of-color-tweaks
pr/34102
pr/37590
previous-next-docs-links
sticky-thead
utilities-functions-mixin
v530-dev
v6-postcss-custom-media
v6-spinner-dots
v6/gs/use-floating-ui-in-place-of-popper
xmr/dev
xmr/docs-png
xmr/docs-svgs
xmr/hugo-reorg-files
xmr/js-2
xmr/markdownlint
xmr/prepare-530-alpha2
xmr/xo
v5.3.0-alpha1
v5.2.3
v5.2.2
v5.2.1
v5.2.0
v5.2.0-beta1
v5.1.3
v5.1.2
v5.1.1
v5.1.0
v5.0.2
v5.0.1
v5.0.0
v5.0.0-beta3
v5.0.0-beta2
v5.0.0-beta1
2 merge requests
!34330
mearged
,
!34302
..
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
js/src/carousel.js
+2
-2
js/src/carousel.js
js/src/collapse.js
+2
-4
js/src/collapse.js
js/src/dropdown.js
+5
-4
js/src/dropdown.js
js/src/modal.js
+2
-7
js/src/modal.js
js/src/popover.js
+4
-4
js/src/popover.js
js/src/scrollspy.js
+2
-5
js/src/scrollspy.js
js/src/tab.js
+5
-14
js/src/tab.js
js/src/tooltip.js
+9
-26
js/src/tooltip.js
js/src/util/index.js
+2
-4
js/src/util/index.js
with
33 additions
and
70 deletions
+33
-70
js/src/carousel.js
+
2
-
2
View file @
701c6c6e
...
@@ -397,6 +397,7 @@ class Carousel extends BaseComponent {
...
@@ -397,6 +397,7 @@ class Carousel extends BaseComponent {
_setActiveIndicatorElement
(
element
)
{
_setActiveIndicatorElement
(
element
)
{
if
(
this
.
_indicatorsElement
)
{
if
(
this
.
_indicatorsElement
)
{
const
indicators
=
SelectorEngine
.
find
(
SELECTOR_ACTIVE
,
this
.
_indicatorsElement
)
const
indicators
=
SelectorEngine
.
find
(
SELECTOR_ACTIVE
,
this
.
_indicatorsElement
)
for
(
let
i
=
0
;
i
<
indicators
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
indicators
.
length
;
i
++
)
{
indicators
[
i
].
classList
.
remove
(
CLASS_NAME_ACTIVE
)
indicators
[
i
].
classList
.
remove
(
CLASS_NAME_ACTIVE
)
}
}
...
@@ -431,8 +432,7 @@ class Carousel extends BaseComponent {
...
@@ -431,8 +432,7 @@ class Carousel extends BaseComponent {
_slide
(
direction
,
element
)
{
_slide
(
direction
,
element
)
{
const
activeElement
=
SelectorEngine
.
findOne
(
SELECTOR_ACTIVE_ITEM
,
this
.
_element
)
const
activeElement
=
SelectorEngine
.
findOne
(
SELECTOR_ACTIVE_ITEM
,
this
.
_element
)
const
activeElementIndex
=
this
.
_getItemIndex
(
activeElement
)
const
activeElementIndex
=
this
.
_getItemIndex
(
activeElement
)
const
nextElement
=
element
||
(
activeElement
&&
const
nextElement
=
element
||
(
activeElement
&&
this
.
_getItemByDirection
(
direction
,
activeElement
))
this
.
_getItemByDirection
(
direction
,
activeElement
))
const
nextElementIndex
=
this
.
_getItemIndex
(
nextElement
)
const
nextElementIndex
=
this
.
_getItemIndex
(
nextElement
)
const
isCycling
=
Boolean
(
this
.
_interval
)
const
isCycling
=
Boolean
(
this
.
_interval
)
...
...
This diff is collapsed.
Click to expand it.
js/src/collapse.js
+
2
-
4
View file @
701c6c6e
...
@@ -124,8 +124,7 @@ class Collapse extends BaseComponent {
...
@@ -124,8 +124,7 @@ class Collapse extends BaseComponent {
}
}
show
()
{
show
()
{
if
(
this
.
_isTransitioning
||
if
(
this
.
_isTransitioning
||
this
.
_element
.
classList
.
contains
(
CLASS_NAME_SHOW
))
{
this
.
_element
.
classList
.
contains
(
CLASS_NAME_SHOW
))
{
return
return
}
}
...
@@ -212,8 +211,7 @@ class Collapse extends BaseComponent {
...
@@ -212,8 +211,7 @@ class Collapse extends BaseComponent {
}
}
hide
()
{
hide
()
{
if
(
this
.
_isTransitioning
||
if
(
this
.
_isTransitioning
||
!
this
.
_element
.
classList
.
contains
(
CLASS_NAME_SHOW
))
{
!
this
.
_element
.
classList
.
contains
(
CLASS_NAME_SHOW
))
{
return
return
}
}
...
...
This diff is collapsed.
Click to expand it.
js/src/dropdown.js
+
5
-
4
View file @
701c6c6e
...
@@ -367,8 +367,7 @@ class Dropdown extends BaseComponent {
...
@@ -367,8 +367,7 @@ class Dropdown extends BaseComponent {
}
}
static
clearMenus
(
event
)
{
static
clearMenus
(
event
)
{
if
(
event
&&
(
event
.
button
===
RIGHT_MOUSE_BUTTON
||
if
(
event
&&
(
event
.
button
===
RIGHT_MOUSE_BUTTON
||
(
event
.
type
===
'
keyup
'
&&
event
.
key
!==
TAB_KEY
)))
{
(
event
.
type
===
'
keyup
'
&&
event
.
key
!==
TAB_KEY
)))
{
return
return
}
}
...
@@ -475,11 +474,13 @@ class Dropdown extends BaseComponent {
...
@@ -475,11 +474,13 @@ class Dropdown extends BaseComponent {
let
index
=
items
.
indexOf
(
event
.
target
)
let
index
=
items
.
indexOf
(
event
.
target
)
if
(
event
.
key
===
ARROW_UP_KEY
&&
index
>
0
)
{
// Up
// Up
if
(
event
.
key
===
ARROW_UP_KEY
&&
index
>
0
)
{
index
--
index
--
}
}
if
(
event
.
key
===
ARROW_DOWN_KEY
&&
index
<
items
.
length
-
1
)
{
// Down
// Down
if
(
event
.
key
===
ARROW_DOWN_KEY
&&
index
<
items
.
length
-
1
)
{
index
++
index
++
}
}
...
...
This diff is collapsed.
Click to expand it.
js/src/modal.js
+
2
-
7
View file @
701c6c6e
...
@@ -136,11 +136,7 @@ class Modal extends BaseComponent {
...
@@ -136,11 +136,7 @@ class Modal extends BaseComponent {
this
.
_setEscapeEvent
()
this
.
_setEscapeEvent
()
this
.
_setResizeEvent
()
this
.
_setResizeEvent
()
EventHandler
.
on
(
this
.
_element
,
EventHandler
.
on
(
this
.
_element
,
EVENT_CLICK_DISMISS
,
SELECTOR_DATA_DISMISS
,
event
=>
this
.
hide
(
event
))
EVENT_CLICK_DISMISS
,
SELECTOR_DATA_DISMISS
,
event
=>
this
.
hide
(
event
)
)
EventHandler
.
on
(
this
.
_dialog
,
EVENT_MOUSEDOWN_DISMISS
,
()
=>
{
EventHandler
.
on
(
this
.
_dialog
,
EVENT_MOUSEDOWN_DISMISS
,
()
=>
{
EventHandler
.
one
(
this
.
_element
,
EVENT_MOUSEUP_DISMISS
,
event
=>
{
EventHandler
.
one
(
this
.
_element
,
EVENT_MOUSEUP_DISMISS
,
event
=>
{
...
@@ -237,8 +233,7 @@ class Modal extends BaseComponent {
...
@@ -237,8 +233,7 @@ class Modal extends BaseComponent {
const
transition
=
this
.
_element
.
classList
.
contains
(
CLASS_NAME_FADE
)
const
transition
=
this
.
_element
.
classList
.
contains
(
CLASS_NAME_FADE
)
const
modalBody
=
SelectorEngine
.
findOne
(
SELECTOR_MODAL_BODY
,
this
.
_dialog
)
const
modalBody
=
SelectorEngine
.
findOne
(
SELECTOR_MODAL_BODY
,
this
.
_dialog
)
if
(
!
this
.
_element
.
parentNode
||
if
(
!
this
.
_element
.
parentNode
||
this
.
_element
.
parentNode
.
nodeType
!==
Node
.
ELEMENT_NODE
)
{
this
.
_element
.
parentNode
.
nodeType
!==
Node
.
ELEMENT_NODE
)
{
// Don't move modal's DOM position
// Don't move modal's DOM position
document
.
body
.
appendChild
(
this
.
_element
)
document
.
body
.
appendChild
(
this
.
_element
)
}
}
...
...
This diff is collapsed.
Click to expand it.
js/src/popover.js
+
4
-
4
View file @
701c6c6e
...
@@ -29,8 +29,9 @@ const Default = {
...
@@ -29,8 +29,9 @@ const Default = {
content
:
''
,
content
:
''
,
template
:
'
<div class="popover" role="tooltip">
'
+
template
:
'
<div class="popover" role="tooltip">
'
+
'
<div class="popover-arrow"></div>
'
+
'
<div class="popover-arrow"></div>
'
+
'
<h3 class="popover-header"></h3>
'
+
'
<h3 class="popover-header"></h3>
'
+
'
<div class="popover-body"></div></div>
'
'
<div class="popover-body"></div>
'
+
'
</div>
'
}
}
const
DefaultType
=
{
const
DefaultType
=
{
...
@@ -118,8 +119,7 @@ class Popover extends Tooltip {
...
@@ -118,8 +119,7 @@ class Popover extends Tooltip {
}
}
_getContent
()
{
_getContent
()
{
return
this
.
_element
.
getAttribute
(
'
data-bs-content
'
)
||
return
this
.
_element
.
getAttribute
(
'
data-bs-content
'
)
||
this
.
config
.
content
this
.
config
.
content
}
}
_cleanTipClass
()
{
_cleanTipClass
()
{
...
...
This diff is collapsed.
Click to expand it.
js/src/scrollspy.js
+
2
-
5
View file @
701c6c6e
...
@@ -196,9 +196,7 @@ class ScrollSpy extends BaseComponent {
...
@@ -196,9 +196,7 @@ class ScrollSpy extends BaseComponent {
_process
()
{
_process
()
{
const
scrollTop
=
this
.
_getScrollTop
()
+
this
.
_config
.
offset
const
scrollTop
=
this
.
_getScrollTop
()
+
this
.
_config
.
offset
const
scrollHeight
=
this
.
_getScrollHeight
()
const
scrollHeight
=
this
.
_getScrollHeight
()
const
maxScroll
=
this
.
_config
.
offset
+
const
maxScroll
=
this
.
_config
.
offset
+
scrollHeight
-
this
.
_getOffsetHeight
()
scrollHeight
-
this
.
_getOffsetHeight
()
if
(
this
.
_scrollHeight
!==
scrollHeight
)
{
if
(
this
.
_scrollHeight
!==
scrollHeight
)
{
this
.
refresh
()
this
.
refresh
()
...
@@ -223,8 +221,7 @@ class ScrollSpy extends BaseComponent {
...
@@ -223,8 +221,7 @@ class ScrollSpy extends BaseComponent {
for
(
let
i
=
this
.
_offsets
.
length
;
i
--
;)
{
for
(
let
i
=
this
.
_offsets
.
length
;
i
--
;)
{
const
isActiveTarget
=
this
.
_activeTarget
!==
this
.
_targets
[
i
]
&&
const
isActiveTarget
=
this
.
_activeTarget
!==
this
.
_targets
[
i
]
&&
scrollTop
>=
this
.
_offsets
[
i
]
&&
scrollTop
>=
this
.
_offsets
[
i
]
&&
(
typeof
this
.
_offsets
[
i
+
1
]
===
'
undefined
'
||
(
typeof
this
.
_offsets
[
i
+
1
]
===
'
undefined
'
||
scrollTop
<
this
.
_offsets
[
i
+
1
])
scrollTop
<
this
.
_offsets
[
i
+
1
])
if
(
isActiveTarget
)
{
if
(
isActiveTarget
)
{
this
.
_activate
(
this
.
_targets
[
i
])
this
.
_activate
(
this
.
_targets
[
i
])
...
...
This diff is collapsed.
Click to expand it.
js/src/tab.js
+
5
-
14
View file @
701c6c6e
...
@@ -95,15 +95,11 @@ class Tab extends BaseComponent {
...
@@ -95,15 +95,11 @@ class Tab extends BaseComponent {
relatedTarget
:
previous
relatedTarget
:
previous
})
})
if
(
showEvent
.
defaultPrevented
||
if
(
showEvent
.
defaultPrevented
||
(
hideEvent
!==
null
&&
hideEvent
.
defaultPrevented
))
{
(
hideEvent
!==
null
&&
hideEvent
.
defaultPrevented
))
{
return
return
}
}
this
.
_activate
(
this
.
_activate
(
this
.
_element
,
listElement
)
this
.
_element
,
listElement
)
const
complete
=
()
=>
{
const
complete
=
()
=>
{
EventHandler
.
trigger
(
previous
,
EVENT_HIDDEN
,
{
EventHandler
.
trigger
(
previous
,
EVENT_HIDDEN
,
{
...
@@ -129,14 +125,9 @@ class Tab extends BaseComponent {
...
@@ -129,14 +125,9 @@ class Tab extends BaseComponent {
SelectorEngine
.
children
(
container
,
SELECTOR_ACTIVE
)
SelectorEngine
.
children
(
container
,
SELECTOR_ACTIVE
)
const
active
=
activeElements
[
0
]
const
active
=
activeElements
[
0
]
const
isTransitioning
=
callback
&&
const
isTransitioning
=
callback
&&
(
active
&&
active
.
classList
.
contains
(
CLASS_NAME_FADE
))
(
active
&&
active
.
classList
.
contains
(
CLASS_NAME_FADE
))
const
complete
=
()
=>
this
.
_transitionComplete
(
element
,
active
,
callback
)
const
complete
=
()
=>
this
.
_transitionComplete
(
element
,
active
,
callback
)
if
(
active
&&
isTransitioning
)
{
if
(
active
&&
isTransitioning
)
{
const
transitionDuration
=
getTransitionDurationFromElement
(
active
)
const
transitionDuration
=
getTransitionDurationFromElement
(
active
)
...
...
This diff is collapsed.
Click to expand it.
js/src/tooltip.js
+
9
-
26
View file @
701c6c6e
...
@@ -72,8 +72,9 @@ const AttachmentMap = {
...
@@ -72,8 +72,9 @@ const AttachmentMap = {
const
Default
=
{
const
Default
=
{
animation
:
true
,
animation
:
true
,
template
:
'
<div class="tooltip" role="tooltip">
'
+
template
:
'
<div class="tooltip" role="tooltip">
'
+
'
<div class="tooltip-arrow"></div>
'
+
'
<div class="tooltip-arrow"></div>
'
+
'
<div class="tooltip-inner"></div></div>
'
,
'
<div class="tooltip-inner"></div>
'
+
'
</div>
'
,
trigger
:
'
hover focus
'
,
trigger
:
'
hover focus
'
,
title
:
''
,
title
:
''
,
delay
:
0
,
delay
:
0
,
...
@@ -196,10 +197,7 @@ class Tooltip extends BaseComponent {
...
@@ -196,10 +197,7 @@ class Tooltip extends BaseComponent {
let
context
=
Data
.
getData
(
event
.
delegateTarget
,
dataKey
)
let
context
=
Data
.
getData
(
event
.
delegateTarget
,
dataKey
)
if
(
!
context
)
{
if
(
!
context
)
{
context
=
new
this
.
constructor
(
context
=
new
this
.
constructor
(
event
.
delegateTarget
,
this
.
_getDelegateConfig
())
event
.
delegateTarget
,
this
.
_getDelegateConfig
()
)
Data
.
setData
(
event
.
delegateTarget
,
dataKey
,
context
)
Data
.
setData
(
event
.
delegateTarget
,
dataKey
,
context
)
}
}
...
@@ -530,10 +528,7 @@ class Tooltip extends BaseComponent {
...
@@ -530,10 +528,7 @@ class Tooltip extends BaseComponent {
triggers
.
forEach
(
trigger
=>
{
triggers
.
forEach
(
trigger
=>
{
if
(
trigger
===
'
click
'
)
{
if
(
trigger
===
'
click
'
)
{
EventHandler
.
on
(
this
.
_element
,
EventHandler
.
on
(
this
.
_element
,
this
.
constructor
.
Event
.
CLICK
,
this
.
config
.
selector
,
event
=>
this
.
toggle
(
event
)
this
.
constructor
.
Event
.
CLICK
,
this
.
config
.
selector
,
event
=>
this
.
toggle
(
event
)
)
)
}
else
if
(
trigger
!==
TRIGGER_MANUAL
)
{
}
else
if
(
trigger
!==
TRIGGER_MANUAL
)
{
const
eventIn
=
trigger
===
TRIGGER_HOVER
?
const
eventIn
=
trigger
===
TRIGGER_HOVER
?
...
@@ -543,16 +538,8 @@ class Tooltip extends BaseComponent {
...
@@ -543,16 +538,8 @@ class Tooltip extends BaseComponent {
this
.
constructor
.
Event
.
MOUSELEAVE
:
this
.
constructor
.
Event
.
MOUSELEAVE
:
this
.
constructor
.
Event
.
FOCUSOUT
this
.
constructor
.
Event
.
FOCUSOUT
EventHandler
.
on
(
this
.
_element
,
EventHandler
.
on
(
this
.
_element
,
eventIn
,
this
.
config
.
selector
,
event
=>
this
.
_enter
(
event
))
eventIn
,
EventHandler
.
on
(
this
.
_element
,
eventOut
,
this
.
config
.
selector
,
event
=>
this
.
_leave
(
event
))
this
.
config
.
selector
,
event
=>
this
.
_enter
(
event
)
)
EventHandler
.
on
(
this
.
_element
,
eventOut
,
this
.
config
.
selector
,
event
=>
this
.
_leave
(
event
)
)
}
}
})
})
...
@@ -562,10 +549,7 @@ class Tooltip extends BaseComponent {
...
@@ -562,10 +549,7 @@ class Tooltip extends BaseComponent {
}
}
}
}
EventHandler
.
on
(
this
.
_element
.
closest
(
`.
${
CLASS_NAME_MODAL
}
`
),
EventHandler
.
on
(
this
.
_element
.
closest
(
`.
${
CLASS_NAME_MODAL
}
`
),
'
hide.bs.modal
'
,
this
.
_hideModalHandler
)
'
hide.bs.modal
'
,
this
.
_hideModalHandler
)
if
(
this
.
config
.
selector
)
{
if
(
this
.
config
.
selector
)
{
this
.
config
=
{
this
.
config
=
{
...
@@ -610,8 +594,7 @@ class Tooltip extends BaseComponent {
...
@@ -610,8 +594,7 @@ class Tooltip extends BaseComponent {
]
=
true
]
=
true
}
}
if
(
context
.
getTipElement
().
classList
.
contains
(
CLASS_NAME_SHOW
)
||
if
(
context
.
getTipElement
().
classList
.
contains
(
CLASS_NAME_SHOW
)
||
context
.
_hoverState
===
HOVER_STATE_SHOW
)
{
context
.
_hoverState
===
HOVER_STATE_SHOW
)
{
context
.
_hoverState
=
HOVER_STATE_SHOW
context
.
_hoverState
=
HOVER_STATE_SHOW
return
return
}
}
...
...
This diff is collapsed.
Click to expand it.
js/src/util/index.js
+
2
-
4
View file @
701c6c6e
...
@@ -66,10 +66,7 @@ const getTransitionDurationFromElement = element => {
...
@@ -66,10 +66,7 @@ const getTransitionDurationFromElement = element => {
}
}
// Get transition-duration of the element
// Get transition-duration of the element
let
{
let
{
transitionDuration
,
transitionDelay
}
=
window
.
getComputedStyle
(
element
)
transitionDuration
,
transitionDelay
}
=
window
.
getComputedStyle
(
element
)
const
floatTransitionDuration
=
Number
.
parseFloat
(
transitionDuration
)
const
floatTransitionDuration
=
Number
.
parseFloat
(
transitionDuration
)
const
floatTransitionDelay
=
Number
.
parseFloat
(
transitionDelay
)
const
floatTransitionDelay
=
Number
.
parseFloat
(
transitionDelay
)
...
@@ -96,6 +93,7 @@ const emulateTransitionEnd = (element, duration) => {
...
@@ -96,6 +93,7 @@ const emulateTransitionEnd = (element, duration) => {
let
called
=
false
let
called
=
false
const
durationPadding
=
5
const
durationPadding
=
5
const
emulatedDuration
=
duration
+
durationPadding
const
emulatedDuration
=
duration
+
durationPadding
function
listener
()
{
function
listener
()
{
called
=
true
called
=
true
element
.
removeEventListener
(
TRANSITION_END
,
listener
)
element
.
removeEventListener
(
TRANSITION_END
,
listener
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets