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
f15af45c
Commit
f15af45c
authored
4 years ago
by
XhmikosR
Browse files
Options
Download
Email Patches
Plain Diff
Unbreak lines.
parent
91c11d64
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
js/src/alert.js
+1
-2
js/src/alert.js
js/src/carousel.js
+18
-23
js/src/carousel.js
js/src/dom/event-handler.js
+2
-0
js/src/dom/event-handler.js
js/src/dropdown.js
+2
-4
js/src/dropdown.js
js/src/scrollspy.js
+18
-21
js/src/scrollspy.js
js/src/toast.js
+1
-6
js/src/toast.js
js/src/tooltip.js
+5
-6
js/src/tooltip.js
with
47 additions
and
62 deletions
+47
-62
js/src/alert.js
+
1
-
2
View file @
f15af45c
...
...
@@ -144,8 +144,7 @@ class Alert {
* Data Api implementation
* ------------------------------------------------------------------------
*/
EventHandler
.
on
(
document
,
EVENT_CLICK_DATA_API
,
SELECTOR_DISMISS
,
Alert
.
handleDismiss
(
new
Alert
()))
EventHandler
.
on
(
document
,
EVENT_CLICK_DATA_API
,
SELECTOR_DISMISS
,
Alert
.
handleDismiss
(
new
Alert
()))
const
$
=
getjQuery
()
...
...
This diff is collapsed.
Click to expand it.
js/src/carousel.js
+
18
-
23
View file @
f15af45c
...
...
@@ -263,15 +263,12 @@ class Carousel {
_addEventListeners
()
{
if
(
this
.
_config
.
keyboard
)
{
EventHandler
.
on
(
this
.
_element
,
EVENT_KEYDOWN
,
event
=>
this
.
_keydown
(
event
))
EventHandler
.
on
(
this
.
_element
,
EVENT_KEYDOWN
,
event
=>
this
.
_keydown
(
event
))
}
if
(
this
.
_config
.
pause
===
'
hover
'
)
{
EventHandler
.
on
(
this
.
_element
,
EVENT_MOUSEENTER
,
event
=>
this
.
pause
(
event
))
EventHandler
.
on
(
this
.
_element
,
EVENT_MOUSELEAVE
,
event
=>
this
.
cycle
(
event
))
EventHandler
.
on
(
this
.
_element
,
EVENT_MOUSEENTER
,
event
=>
this
.
pause
(
event
))
EventHandler
.
on
(
this
.
_element
,
EVENT_MOUSELEAVE
,
event
=>
this
.
cycle
(
event
))
}
if
(
this
.
_config
.
touch
&&
this
.
_touchSupported
)
{
...
...
@@ -476,24 +473,23 @@ class Carousel {
const
transitionDuration
=
getTransitionDurationFromElement
(
activeElement
)
EventHandler
.
one
(
activeElement
,
TRANSITION_END
,
()
=>
{
nextElement
.
classList
.
remove
(
directionalClassName
,
orderClassName
)
nextElement
.
classList
.
add
(
CLASS_NAME_ACTIVE
)
EventHandler
.
one
(
activeElement
,
TRANSITION_END
,
()
=>
{
nextElement
.
classList
.
remove
(
directionalClassName
,
orderClassName
)
nextElement
.
classList
.
add
(
CLASS_NAME_ACTIVE
)
activeElement
.
classList
.
remove
(
CLASS_NAME_ACTIVE
,
orderClassName
,
directionalClassName
)
activeElement
.
classList
.
remove
(
CLASS_NAME_ACTIVE
,
orderClassName
,
directionalClassName
)
this
.
_isSliding
=
false
this
.
_isSliding
=
false
setTimeout
(()
=>
{
EventHandler
.
trigger
(
this
.
_element
,
EVENT_SLID
,
{
relatedTarget
:
nextElement
,
direction
:
eventDirectionName
,
from
:
activeElementIndex
,
to
:
nextElementIndex
})
},
0
)
})
setTimeout
(()
=>
{
EventHandler
.
trigger
(
this
.
_element
,
EVENT_SLID
,
{
relatedTarget
:
nextElement
,
direction
:
eventDirectionName
,
from
:
activeElementIndex
,
to
:
nextElementIndex
})
},
0
)
})
emulateTransitionEnd
(
activeElement
,
transitionDuration
)
}
else
{
...
...
@@ -593,8 +589,7 @@ class Carousel {
* ------------------------------------------------------------------------
*/
EventHandler
.
on
(
document
,
EVENT_CLICK_DATA_API
,
SELECTOR_DATA_SLIDE
,
Carousel
.
dataApiClickHandler
)
EventHandler
.
on
(
document
,
EVENT_CLICK_DATA_API
,
SELECTOR_DATA_SLIDE
,
Carousel
.
dataApiClickHandler
)
EventHandler
.
on
(
window
,
EVENT_LOAD_DATA_API
,
()
=>
{
const
carousels
=
SelectorEngine
.
find
(
SELECTOR_DATA_RIDE
)
...
...
This diff is collapsed.
Click to expand it.
js/src/dom/event-handler.js
+
2
-
0
View file @
f15af45c
...
...
@@ -95,6 +95,7 @@ function getEvent(element) {
function
bootstrapHandler
(
element
,
fn
)
{
return
function
handler
(
event
)
{
event
.
delegateTarget
=
element
if
(
handler
.
oneOff
)
{
EventHandler
.
off
(
element
,
event
.
type
,
fn
)
}
...
...
@@ -111,6 +112,7 @@ function bootstrapDelegationHandler(element, selector, fn) {
for
(
let
i
=
domElements
.
length
;
i
--
;)
{
if
(
domElements
[
i
]
===
target
)
{
event
.
delegateTarget
=
target
if
(
handler
.
oneOff
)
{
EventHandler
.
off
(
element
,
event
.
type
,
fn
)
}
...
...
This diff is collapsed.
Click to expand it.
js/src/dropdown.js
+
2
-
4
View file @
f15af45c
...
...
@@ -468,8 +468,7 @@ class Dropdown {
return
}
const
items
=
SelectorEngine
.
find
(
SELECTOR_VISIBLE_ITEMS
,
parent
)
.
filter
(
isVisible
)
const
items
=
SelectorEngine
.
find
(
SELECTOR_VISIBLE_ITEMS
,
parent
).
filter
(
isVisible
)
if
(
!
items
.
length
)
{
return
...
...
@@ -511,8 +510,7 @@ EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (
event
.
stopPropagation
()
Dropdown
.
dropdownInterface
(
this
,
'
toggle
'
)
})
EventHandler
.
on
(
document
,
EVENT_CLICK_DATA_API
,
SELECTOR_FORM_CHILD
,
e
=>
e
.
stopPropagation
())
EventHandler
.
on
(
document
,
EVENT_CLICK_DATA_API
,
SELECTOR_FORM_CHILD
,
e
=>
e
.
stopPropagation
())
const
$
=
getjQuery
()
...
...
This diff is collapsed.
Click to expand it.
js/src/scrollspy.js
+
18
-
21
View file @
f15af45c
...
...
@@ -118,27 +118,26 @@ class ScrollSpy {
const
targets
=
SelectorEngine
.
find
(
this
.
_selector
)
targets
.
map
(
element
=>
{
let
target
const
targetSelector
=
getSelectorFromElement
(
element
)
targets
.
map
(
element
=>
{
let
target
const
targetSelector
=
getSelectorFromElement
(
element
)
if
(
targetSelector
)
{
target
=
SelectorEngine
.
findOne
(
targetSelector
)
}
if
(
targetSelector
)
{
target
=
SelectorEngine
.
findOne
(
targetSelector
)
}
if
(
target
)
{
const
targetBCR
=
target
.
getBoundingClientRect
()
if
(
targetBCR
.
width
||
targetBCR
.
height
)
{
return
[
Manipulator
[
offsetMethod
](
target
).
top
+
offsetBase
,
targetSelector
]
}
if
(
target
)
{
const
targetBCR
=
target
.
getBoundingClientRect
()
if
(
targetBCR
.
width
||
targetBCR
.
height
)
{
return
[
Manipulator
[
offsetMethod
](
target
).
top
+
offsetBase
,
targetSelector
]
}
}
return
null
})
return
null
})
.
filter
(
item
=>
item
)
.
sort
((
a
,
b
)
=>
a
[
0
]
-
b
[
0
])
.
forEach
(
item
=>
{
...
...
@@ -253,8 +252,7 @@ class ScrollSpy {
const
link
=
SelectorEngine
.
findOne
(
queries
.
join
(
'
,
'
))
if
(
link
.
classList
.
contains
(
CLASS_NAME_DROPDOWN_ITEM
))
{
SelectorEngine
.
findOne
(
SELECTOR_DROPDOWN_TOGGLE
,
link
.
closest
(
SELECTOR_DROPDOWN
))
SelectorEngine
.
findOne
(
SELECTOR_DROPDOWN_TOGGLE
,
link
.
closest
(
SELECTOR_DROPDOWN
))
.
classList
.
add
(
CLASS_NAME_ACTIVE
)
link
.
classList
.
add
(
CLASS_NAME_ACTIVE
)
...
...
@@ -262,8 +260,7 @@ class ScrollSpy {
// Set triggered link as active
link
.
classList
.
add
(
CLASS_NAME_ACTIVE
)
SelectorEngine
.
parents
(
link
,
SELECTOR_NAV_LIST_GROUP
)
SelectorEngine
.
parents
(
link
,
SELECTOR_NAV_LIST_GROUP
)
.
forEach
(
listGroup
=>
{
// Set triggered links parents as active
// With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor
...
...
This diff is collapsed.
Click to expand it.
js/src/toast.js
+
1
-
6
View file @
f15af45c
...
...
@@ -179,12 +179,7 @@ class Toast {
}
_setListeners
()
{
EventHandler
.
on
(
this
.
_element
,
EVENT_CLICK_DISMISS
,
SELECTOR_DATA_DISMISS
,
()
=>
this
.
hide
()
)
EventHandler
.
on
(
this
.
_element
,
EVENT_CLICK_DISMISS
,
SELECTOR_DATA_DISMISS
,
()
=>
this
.
hide
())
}
_clearTimeout
()
{
...
...
This diff is collapsed.
Click to expand it.
js/src/tooltip.js
+
5
-
6
View file @
f15af45c
...
...
@@ -676,12 +676,11 @@ class Tooltip {
_getConfig
(
config
)
{
const
dataAttributes
=
Manipulator
.
getDataAttributes
(
this
.
element
)
Object
.
keys
(
dataAttributes
)
.
forEach
(
dataAttr
=>
{
if
(
DISALLOWED_ATTRIBUTES
.
indexOf
(
dataAttr
)
!==
-
1
)
{
delete
dataAttributes
[
dataAttr
]
}
})
Object
.
keys
(
dataAttributes
).
forEach
(
dataAttr
=>
{
if
(
DISALLOWED_ATTRIBUTES
.
indexOf
(
dataAttr
)
!==
-
1
)
{
delete
dataAttributes
[
dataAttr
]
}
})
if
(
config
&&
typeof
config
.
container
===
'
object
'
&&
config
.
container
.
jquery
)
{
config
.
container
=
config
.
container
[
0
]
...
...
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