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
b5077a1a
Commit
b5077a1a
authored
7 years ago
by
Johann-S
Committed by
XhmikosR
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix one forgets of using jQuery in Carousel and Tooltip
parent
2929bf96
main
cleanup-floating-forms
cssvar-function
dependabot/npm_and_yarn/stylelint-and-stylelint-config-twbs-bootstrap-15.3.0
extend-snippets
feat/data-target
floating-always-visible
floating-labels-icons
fod-main-banner
form-controls-with-icons
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
v5.0.0-alpha3
v5.0.0-alpha2
v5.0.0-alpha1
5 merge requests
!31948
Examples/Floating-labels: fix bad behavior with autofill
,
!30064
test
,
!29779
Responsive sizing
,
!28882
fix custom-select-indicator in IE10
,
!28721
Hot test
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
js/src/carousel.js
+33
-28
js/src/carousel.js
with
33 additions
and
28 deletions
+33
-28
js/src/carousel.js
+
33
-
28
View file @
b5077a1a
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
import
Data
from
'
./dom/data
'
import
Data
from
'
./dom/data
'
import
EventHandler
from
'
./dom/eventHandler
'
import
EventHandler
from
'
./dom/eventHandler
'
import
Manipulator
from
'
./dom/manipulator
'
import
SelectorEngine
from
'
./dom/selectorEngine
'
import
SelectorEngine
from
'
./dom/selectorEngine
'
import
Util
from
'
./util
'
import
Util
from
'
./util
'
...
@@ -322,6 +323,7 @@ class Carousel {
...
@@ -322,6 +323,7 @@ class Carousel {
[].
slice
.
call
(
SelectorEngine
.
find
(
Selector
.
ITEM_IMG
,
this
.
_element
)).
forEach
((
itemImg
)
=>
{
[].
slice
.
call
(
SelectorEngine
.
find
(
Selector
.
ITEM_IMG
,
this
.
_element
)).
forEach
((
itemImg
)
=>
{
EventHandler
.
on
(
itemImg
,
Event
.
DRAG_START
,
(
e
)
=>
e
.
preventDefault
())
EventHandler
.
on
(
itemImg
,
Event
.
DRAG_START
,
(
e
)
=>
e
.
preventDefault
())
})
})
if
(
this
.
_pointerEvent
)
{
if
(
this
.
_pointerEvent
)
{
EventHandler
.
on
(
this
.
_element
,
Event
.
POINTERDOWN
,
(
event
)
=>
start
(
event
))
EventHandler
.
on
(
this
.
_element
,
Event
.
POINTERDOWN
,
(
event
)
=>
start
(
event
))
EventHandler
.
on
(
this
.
_element
,
Event
.
POINTERUP
,
(
event
)
=>
end
(
event
))
EventHandler
.
on
(
this
.
_element
,
Event
.
POINTERUP
,
(
event
)
=>
end
(
event
))
...
@@ -507,39 +509,42 @@ class Carousel {
...
@@ -507,39 +509,42 @@ class Carousel {
// Static
// Static
static
_jQueryInterface
(
config
)
{
static
_carouselInterface
(
element
,
config
)
{
return
this
.
each
(
function
()
{
let
data
=
Data
.
getData
(
element
,
DATA_KEY
)
let
data
=
Data
.
getData
(
this
,
DATA_KEY
)
let
_config
=
{
let
_config
=
{
...
Default
,
...
Default
,
...
Manipulator
.
getDataAttributes
(
element
)
...
Data
.
getData
(
this
,
DATA_KEY
)
}
}
if
(
typeof
config
===
'
object
'
)
{
if
(
typeof
config
===
'
object
'
)
{
_config
=
{
_config
=
{
...
_config
,
...
_config
,
...
config
...
config
}
}
}
}
const
action
=
typeof
config
===
'
string
'
?
config
:
_config
.
slide
const
action
=
typeof
config
===
'
string
'
?
config
:
_config
.
slide
if
(
!
data
)
{
if
(
!
data
)
{
data
=
new
Carousel
(
this
,
_config
)
data
=
new
Carousel
(
element
,
_config
)
Data
.
setData
(
this
,
DATA_KEY
,
data
)
}
}
if
(
typeof
config
===
'
number
'
)
{
if
(
typeof
config
===
'
number
'
)
{
data
.
to
(
config
)
data
.
to
(
config
)
}
else
if
(
typeof
action
===
'
string
'
)
{
}
else
if
(
typeof
action
===
'
string
'
)
{
if
(
typeof
data
[
action
]
===
'
undefined
'
)
{
if
(
typeof
data
[
action
]
===
'
undefined
'
)
{
throw
new
TypeError
(
`No method named "
${
action
}
"`
)
throw
new
Error
(
`No method named "
${
action
}
"`
)
}
data
[
action
]()
}
else
if
(
_config
.
interval
&&
_config
.
ride
)
{
data
.
pause
()
data
.
cycle
()
}
}
data
[
action
]()
}
else
if
(
_config
.
interval
&&
_config
.
ride
)
{
data
.
pause
()
data
.
cycle
()
}
}
static
_jQueryInterface
(
config
)
{
return
this
.
each
(
function
()
{
Carousel
.
_carouselInterface
(
this
,
config
)
})
})
}
}
...
@@ -588,7 +593,7 @@ EventHandler
...
@@ -588,7 +593,7 @@ EventHandler
EventHandler
.
on
(
window
,
Event
.
LOAD_DATA_API
,
()
=>
{
EventHandler
.
on
(
window
,
Event
.
LOAD_DATA_API
,
()
=>
{
const
carousels
=
Util
.
makeArray
(
SelectorEngine
.
find
(
Selector
.
DATA_RIDE
))
const
carousels
=
Util
.
makeArray
(
SelectorEngine
.
find
(
Selector
.
DATA_RIDE
))
for
(
let
i
=
0
,
len
=
carousels
.
length
;
i
<
len
;
i
++
)
{
for
(
let
i
=
0
,
len
=
carousels
.
length
;
i
<
len
;
i
++
)
{
Carousel
.
_
jQuery
Interface
.
call
(
$
(
carousels
[
i
]
)
,
Data
.
getData
(
carousels
[
i
],
DATA_KEY
))
Carousel
.
_
carousel
Interface
.
call
(
carousels
[
i
],
Data
.
getData
(
carousels
[
i
],
DATA_KEY
))
}
}
})
})
...
...
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