Skip to content
GitLab
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
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 {
_setActiveIndicatorElement
(
element
)
{
if
(
this
.
_indicatorsElement
)
{
const
indicators
=
SelectorEngine
.
find
(
SELECTOR_ACTIVE
,
this
.
_indicatorsElement
)
for
(
let
i
=
0
;
i
<
indicators
.
length
;
i
++
)
{
indicators
[
i
].
classList
.
remove
(
CLASS_NAME_ACTIVE
)
}
...
...
@@ -431,8 +432,7 @@ class Carousel extends BaseComponent {
_slide
(
direction
,
element
)
{
const
activeElement
=
SelectorEngine
.
findOne
(
SELECTOR_ACTIVE_ITEM
,
this
.
_element
)
const
activeElementIndex
=
this
.
_getItemIndex
(
activeElement
)
const
nextElement
=
element
||
(
activeElement
&&
this
.
_getItemByDirection
(
direction
,
activeElement
))
const
nextElement
=
element
||
(
activeElement
&&
this
.
_getItemByDirection
(
direction
,
activeElement
))
const
nextElementIndex
=
this
.
_getItemIndex
(
nextElement
)
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 {
}
show
()
{
if
(
this
.
_isTransitioning
||
this
.
_element
.
classList
.
contains
(
CLASS_NAME_SHOW
))
{
if
(
this
.
_isTransitioning
||
this
.
_element
.
classList
.
contains
(
CLASS_NAME_SHOW
))
{
return
}
...
...
@@ -212,8 +211,7 @@ class Collapse extends BaseComponent {
}
hide
()
{
if
(
this
.
_isTransitioning
||
!
this
.
_element
.
classList
.
contains
(
CLASS_NAME_SHOW
))
{
if
(
this
.
_isTransitioning
||
!
this
.
_element
.
classList
.
contains
(
CLASS_NAME_SHOW
))
{
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 {
}
static
clearMenus
(
event
)
{
if
(
event
&&
(
event
.
button
===
RIGHT_MOUSE_BUTTON
||
(
event
.
type
===
'
keyup
'
&&
event
.
key
!==
TAB_KEY
)))
{
if
(
event
&&
(
event
.
button
===
RIGHT_MOUSE_BUTTON
||
(
event
.
type
===
'
keyup
'
&&
event
.
key
!==
TAB_KEY
)))
{
return
}
...
...
@@ -475,11 +474,13 @@ class Dropdown extends BaseComponent {
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
--
}
if
(
event
.
key
===
ARROW_DOWN_KEY
&&
index
<
items
.
length
-
1
)
{
// Down
// Down
if
(
event
.
key
===
ARROW_DOWN_KEY
&&
index
<
items
.
length
-
1
)
{
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 {
this
.
_setEscapeEvent
()
this
.
_setResizeEvent
()
EventHandler
.
on
(
this
.
_element
,
EVENT_CLICK_DISMISS
,
SELECTOR_DATA_DISMISS
,
event
=>
this
.
hide
(
event
)
)
EventHandler
.
on
(
this
.
_element
,
EVENT_CLICK_DISMISS
,
SELECTOR_DATA_DISMISS
,
event
=>
this
.
hide
(
event
))
EventHandler
.
on
(
this
.
_dialog
,
EVENT_MOUSEDOWN_DISMISS
,
()
=>
{
EventHandler
.
one
(
this
.
_element
,
EVENT_MOUSEUP_DISMISS
,
event
=>
{
...
...
@@ -237,8 +233,7 @@ class Modal extends BaseComponent {
const
transition
=
this
.
_element
.
classList
.
contains
(
CLASS_NAME_FADE
)
const
modalBody
=
SelectorEngine
.
findOne
(
SELECTOR_MODAL_BODY
,
this
.
_dialog
)
if
(
!
this
.
_element
.
parentNode
||
this
.
_element
.
parentNode
.
nodeType
!==
Node
.
ELEMENT_NODE
)
{
if
(
!
this
.
_element
.
parentNode
||
this
.
_element
.
parentNode
.
nodeType
!==
Node
.
ELEMENT_NODE
)
{
// Don't move modal's DOM position
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 = {
content
:
''
,
template
:
'
<div class="popover" role="tooltip">
'
+
'
<div class="popover-arrow"></div>
'
+
'
<h3 class="popover-header"></h3>
'
+
'
<div class="popover-body"></div></div>
'
'
<h3 class="popover-header"></h3>
'
+
'
<div class="popover-body"></div>
'
+
'
</div>
'
}
const
DefaultType
=
{
...
...
@@ -118,8 +119,7 @@ class Popover extends Tooltip {
}
_getContent
()
{
return
this
.
_element
.
getAttribute
(
'
data-bs-content
'
)
||
this
.
config
.
content
return
this
.
_element
.
getAttribute
(
'
data-bs-content
'
)
||
this
.
config
.
content
}
_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 {
_process
()
{
const
scrollTop
=
this
.
_getScrollTop
()
+
this
.
_config
.
offset
const
scrollHeight
=
this
.
_getScrollHeight
()
const
maxScroll
=
this
.
_config
.
offset
+
scrollHeight
-
this
.
_getOffsetHeight
()
const
maxScroll
=
this
.
_config
.
offset
+
scrollHeight
-
this
.
_getOffsetHeight
()
if
(
this
.
_scrollHeight
!==
scrollHeight
)
{
this
.
refresh
()
...
...
@@ -223,8 +221,7 @@ class ScrollSpy extends BaseComponent {
for
(
let
i
=
this
.
_offsets
.
length
;
i
--
;)
{
const
isActiveTarget
=
this
.
_activeTarget
!==
this
.
_targets
[
i
]
&&
scrollTop
>=
this
.
_offsets
[
i
]
&&
(
typeof
this
.
_offsets
[
i
+
1
]
===
'
undefined
'
||
scrollTop
<
this
.
_offsets
[
i
+
1
])
(
typeof
this
.
_offsets
[
i
+
1
]
===
'
undefined
'
||
scrollTop
<
this
.
_offsets
[
i
+
1
])
if
(
isActiveTarget
)
{
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 {
relatedTarget
:
previous
})
if
(
showEvent
.
defaultPrevented
||
(
hideEvent
!==
null
&&
hideEvent
.
defaultPrevented
))
{
if
(
showEvent
.
defaultPrevented
||
(
hideEvent
!==
null
&&
hideEvent
.
defaultPrevented
))
{
return
}
this
.
_activate
(
this
.
_element
,
listElement
)
this
.
_activate
(
this
.
_element
,
listElement
)
const
complete
=
()
=>
{
EventHandler
.
trigger
(
previous
,
EVENT_HIDDEN
,
{
...
...
@@ -129,14 +125,9 @@ class Tab extends BaseComponent {
SelectorEngine
.
children
(
container
,
SELECTOR_ACTIVE
)
const
active
=
activeElements
[
0
]
const
isTransitioning
=
callback
&&
(
active
&&
active
.
classList
.
contains
(
CLASS_NAME_FADE
))
const
complete
=
()
=>
this
.
_transitionComplete
(
element
,
active
,
callback
)
const
isTransitioning
=
callback
&&
(
active
&&
active
.
classList
.
contains
(
CLASS_NAME_FADE
))
const
complete
=
()
=>
this
.
_transitionComplete
(
element
,
active
,
callback
)
if
(
active
&&
isTransitioning
)
{
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 = {
const
Default
=
{
animation
:
true
,
template
:
'
<div class="tooltip" role="tooltip">
'
+
'
<div class="tooltip-arrow"></div>
'
+
'
<div class="tooltip-inner"></div></div>
'
,
'
<div class="tooltip-arrow"></div>
'
+
'
<div class="tooltip-inner"></div>
'
+
'
</div>
'
,
trigger
:
'
hover focus
'
,
title
:
''
,
delay
:
0
,
...
...
@@ -196,10 +197,7 @@ class Tooltip extends BaseComponent {
let
context
=
Data
.
getData
(
event
.
delegateTarget
,
dataKey
)
if
(
!
context
)
{
context
=
new
this
.
constructor
(
event
.
delegateTarget
,
this
.
_getDelegateConfig
()
)
context
=
new
this
.
constructor
(
event
.
delegateTarget
,
this
.
_getDelegateConfig
())
Data
.
setData
(
event
.
delegateTarget
,
dataKey
,
context
)
}
...
...
@@ -530,10 +528,7 @@ class Tooltip extends BaseComponent {
triggers
.
forEach
(
trigger
=>
{
if
(
trigger
===
'
click
'
)
{
EventHandler
.
on
(
this
.
_element
,
this
.
constructor
.
Event
.
CLICK
,
this
.
config
.
selector
,
event
=>
this
.
toggle
(
event
)
EventHandler
.
on
(
this
.
_element
,
this
.
constructor
.
Event
.
CLICK
,
this
.
config
.
selector
,
event
=>
this
.
toggle
(
event
)
)
}
else
if
(
trigger
!==
TRIGGER_MANUAL
)
{
const
eventIn
=
trigger
===
TRIGGER_HOVER
?
...
...
@@ -543,16 +538,8 @@ class Tooltip extends BaseComponent {
this
.
constructor
.
Event
.
MOUSELEAVE
:
this
.
constructor
.
Event
.
FOCUSOUT
EventHandler
.
on
(
this
.
_element
,
eventIn
,
this
.
config
.
selector
,
event
=>
this
.
_enter
(
event
)
)
EventHandler
.
on
(
this
.
_element
,
eventOut
,
this
.
config
.
selector
,
event
=>
this
.
_leave
(
event
)
)
EventHandler
.
on
(
this
.
_element
,
eventIn
,
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 {
}
}
EventHandler
.
on
(
this
.
_element
.
closest
(
`.
${
CLASS_NAME_MODAL
}
`
),
'
hide.bs.modal
'
,
this
.
_hideModalHandler
)
EventHandler
.
on
(
this
.
_element
.
closest
(
`.
${
CLASS_NAME_MODAL
}
`
),
'
hide.bs.modal
'
,
this
.
_hideModalHandler
)
if
(
this
.
config
.
selector
)
{
this
.
config
=
{
...
...
@@ -610,8 +594,7 @@ class Tooltip extends BaseComponent {
]
=
true
}
if
(
context
.
getTipElement
().
classList
.
contains
(
CLASS_NAME_SHOW
)
||
context
.
_hoverState
===
HOVER_STATE_SHOW
)
{
if
(
context
.
getTipElement
().
classList
.
contains
(
CLASS_NAME_SHOW
)
||
context
.
_hoverState
===
HOVER_STATE_SHOW
)
{
context
.
_hoverState
=
HOVER_STATE_SHOW
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 => {
}
// Get transition-duration of the element
let
{
transitionDuration
,
transitionDelay
}
=
window
.
getComputedStyle
(
element
)
let
{
transitionDuration
,
transitionDelay
}
=
window
.
getComputedStyle
(
element
)
const
floatTransitionDuration
=
Number
.
parseFloat
(
transitionDuration
)
const
floatTransitionDelay
=
Number
.
parseFloat
(
transitionDelay
)
...
...
@@ -96,6 +93,7 @@ const emulateTransitionEnd = (element, duration) => {
let
called
=
false
const
durationPadding
=
5
const
emulatedDuration
=
duration
+
durationPadding
function
listener
()
{
called
=
true
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