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
8e7ba02c
Commit
8e7ba02c
authored
7 years ago
by
Johann-S
Browse files
Options
Download
Email Patches
Plain Diff
Modal plugin set _isTransitioning after the trigger of hide event
parent
da22bce2
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
v4-dev
v4-dev-dropdown-hide-method
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
v4.6.2
v4.6.1
v4.6.0
v4.5.3
v4.5.2
v4.5.1
v4.5.0
v4.4.1
v4.4.0
v4.3.1
v4.3.0
v4.2.1
v4.2.0
v4.1.3
v4.1.2
v4.1.1
v4.1.0
v4.0.0
v4.0.0-beta.3
v4.0.0-beta.2
8 merge requests
!28721
Hot test
,
!27561
Adds font-weight-medium to font weight classes
,
!25494
web pack
,
!25326
Adjust examples
,
!24514
V4 dev xmr eslint
,
!24390
1
,
!23207
#22402 : modal: new autofocus & keyboardBtnNav options
,
!17021
v4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
js/src/modal.js
+6
-6
js/src/modal.js
js/tests/visual/modal.html
+22
-0
js/tests/visual/modal.html
with
28 additions
and
6 deletions
+28
-6
js/src/modal.js
+
6
-
6
View file @
8e7ba02c
...
@@ -169,12 +169,6 @@ const Modal = (() => {
...
@@ -169,12 +169,6 @@ const Modal = (() => {
return
return
}
}
const
transition
=
Util
.
supportsTransitionEnd
()
&&
$
(
this
.
_element
).
hasClass
(
ClassName
.
FADE
)
if
(
transition
)
{
this
.
_isTransitioning
=
true
}
const
hideEvent
=
$
.
Event
(
Event
.
HIDE
)
const
hideEvent
=
$
.
Event
(
Event
.
HIDE
)
$
(
this
.
_element
).
trigger
(
hideEvent
)
$
(
this
.
_element
).
trigger
(
hideEvent
)
...
@@ -185,6 +179,12 @@ const Modal = (() => {
...
@@ -185,6 +179,12 @@ const Modal = (() => {
this
.
_isShown
=
false
this
.
_isShown
=
false
const
transition
=
Util
.
supportsTransitionEnd
()
&&
$
(
this
.
_element
).
hasClass
(
ClassName
.
FADE
)
if
(
transition
)
{
this
.
_isTransitioning
=
true
}
this
.
_setEscapeEvent
()
this
.
_setEscapeEvent
()
this
.
_setResizeEvent
()
this
.
_setResizeEvent
()
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/modal.html
+
22
-
0
View file @
8e7ba02c
...
@@ -171,6 +171,12 @@
...
@@ -171,6 +171,12 @@
<button
type=
"button"
class=
"btn btn-secondary btn-lg"
data-toggle=
"modal"
data-target=
"<div class="modal fade the-bad" tabindex="-1" role="dialog"><div class="modal-dialog" role="document"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button><h4 class="modal-title">The Bad Modal</h4></div><div class="modal-body">This modal's HTTML source code is declared inline, inside the data-target attribute of it's show-button</div></div></div></div>"
>
<button
type=
"button"
class=
"btn btn-secondary btn-lg"
data-toggle=
"modal"
data-target=
"<div class="modal fade the-bad" tabindex="-1" role="dialog"><div class="modal-dialog" role="document"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button><h4 class="modal-title">The Bad Modal</h4></div><div class="modal-body">This modal's HTTML source code is declared inline, inside the data-target attribute of it's show-button</div></div></div></div>"
>
Modal with an XSS inside the data-target
Modal with an XSS inside the data-target
</button>
</button>
<br><br>
<button
type=
"button"
class=
"btn btn-secondary btn-lg"
id=
"btnPreventModal"
>
Launch prevented modal on hide (to see the result open your console)
</button>
</div>
</div>
<script
src=
"../../../assets/js/vendor/jquery-slim.min.js"
></script>
<script
src=
"../../../assets/js/vendor/jquery-slim.min.js"
></script>
...
@@ -203,6 +209,22 @@
...
@@ -203,6 +209,22 @@
$
(
'
#firefoxModal
'
).
on
(
'
focus
'
,
reportFirefoxTestResult
.
bind
(
false
))
$
(
'
#firefoxModal
'
).
on
(
'
focus
'
,
reportFirefoxTestResult
.
bind
(
false
))
$
(
'
#ff-bug-input
'
).
on
(
'
focus
'
,
reportFirefoxTestResult
.
bind
(
true
))
$
(
'
#ff-bug-input
'
).
on
(
'
focus
'
,
reportFirefoxTestResult
.
bind
(
true
))
})
})
$
(
'
#btnPreventModal
'
).
on
(
'
click
'
,
function
()
{
$
(
'
#firefoxModal
'
).
one
(
'
shown.bs.modal
'
,
function
()
{
$
(
this
).
modal
(
'
hide
'
)
})
.
one
(
'
hide.bs.modal
'
,
function
(
event
)
{
event
.
preventDefault
()
if
(
$
(
this
).
data
(
'
bs.modal
'
).
_isTransitioning
)
{
console
.
error
(
'
Modal plugin should not set _isTransitioning when hide event is prevented
'
)
}
else
{
console
.
log
(
'
Test passed
'
)
$
(
this
).
modal
(
'
hide
'
)
// work as expected
}
})
.
modal
(
'
show
'
)
})
})
})
</script>
</script>
</body>
</body>
...
...
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