Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/build-plugins.js121
-rw-r--r--js/src/alert.js10
-rw-r--r--js/src/carousel.js12
-rw-r--r--js/src/dom/data.js2
-rw-r--r--js/src/dom/eventHandler.js18
-rw-r--r--js/src/dom/manipulator.js2
-rw-r--r--js/src/dom/polyfill.js2
-rw-r--r--js/src/dom/selectorEngine.js2
-rw-r--r--js/src/dropdown.js2
-rw-r--r--js/src/index.js17
-rw-r--r--js/src/modal.js24
-rw-r--r--js/src/tooltip.js3
-rw-r--r--js/src/util.js2
-rw-r--r--js/tests/index.html2
-rw-r--r--js/tests/karma.conf.js8
-rw-r--r--js/tests/unit/carousel.js25
-rw-r--r--js/tests/unit/dropdown.js67
-rw-r--r--js/tests/unit/modal.js85
-rw-r--r--js/tests/unit/tooltip.js4
-rw-r--r--js/tests/visual/alert.html2
-rw-r--r--js/tests/visual/carousel.html1
-rw-r--r--js/tests/visual/collapse.html2
-rw-r--r--js/tests/visual/dropdown.html2
-rw-r--r--js/tests/visual/modal.html2
-rw-r--r--js/tests/visual/popover.html2
-rw-r--r--js/tests/visual/scrollspy.html3
-rw-r--r--js/tests/visual/tab.html2
-rw-r--r--js/tests/visual/tooltip.html2
28 files changed, 228 insertions, 198 deletions
diff --git a/build/build-plugins.js b/build/build-plugins.js
index abcbc5e2f5..a5f95a9d15 100644
--- a/build/build-plugins.js
+++ b/build/build-plugins.js
@@ -26,6 +26,11 @@ const plugins = [
})
]
const bsPlugins = {
+ Data: path.resolve(__dirname, '../js/src/dom/data.js'),
+ EventHandler: path.resolve(__dirname, '../js/src/dom/eventHandler.js'),
+ Manipulator: path.resolve(__dirname, '../js/src/dom/manipulator.js'),
+ Polyfill: path.resolve(__dirname, '../js/src/dom/polyfill.js'),
+ SelectorEngine: path.resolve(__dirname, '../js/src/dom/selectorEngine.js'),
Alert: path.resolve(__dirname, '../js/src/alert.js'),
Button: path.resolve(__dirname, '../js/src/button.js'),
Carousel: path.resolve(__dirname, '../js/src/carousel.js'),
@@ -41,26 +46,112 @@ const bsPlugins = {
}
const rootPath = TEST ? '../js/coverage/dist/' : '../js/dist/'
-function build(plugin) {
- console.log(`Building ${plugin} plugin...`)
+const defaultPluginConfig = {
+ external: [
+ bsPlugins.Data,
+ bsPlugins.EventHandler,
+ bsPlugins.SelectorEngine,
+ bsPlugins.Util
+ ],
+ globals: {
+ [bsPlugins.Data]: 'Data',
+ [bsPlugins.EventHandler]: 'EventHandler',
+ [bsPlugins.SelectorEngine]: 'SelectorEngine',
+ [bsPlugins.Util]: 'Util'
+ }
+}
+
+function getConfigByPluginKey(pluginKey) {
+ if (
+ pluginKey === 'Data' ||
+ pluginKey === 'Manipulator' ||
+ pluginKey === 'Util'
+ ) {
+ return {
+ external: [],
+ globals: {}
+ }
+ }
+
+ if (pluginKey === 'EventHandler' || pluginKey === 'SelectorEngine') {
+ return {
+ external: [
+ bsPlugins.Polyfill,
+ bsPlugins.Util
+ ],
+ globals: {
+ [bsPlugins.Polyfill]: 'Polyfill',
+ [bsPlugins.Util]: 'Util'
+ }
+ }
+ }
+
+ if (pluginKey === 'Polyfill') {
+ return {
+ external: [bsPlugins.Util],
+ globals: {
+ [bsPlugins.Util]: 'Util'
+ }
+ }
+ }
+
+ if (pluginKey === 'Alert' || pluginKey === 'Tab') {
+ return defaultPluginConfig
+ }
- const external = ['jquery', 'popper.js']
- const globals = {
- jquery: 'jQuery', // Ensure we use jQuery which is always available even in noConflict mode
- 'popper.js': 'Popper'
+ if (
+ pluginKey === 'Button' ||
+ pluginKey === 'Carousel' ||
+ pluginKey === 'Collapse' ||
+ pluginKey === 'Modal' ||
+ pluginKey === 'ScrollSpy'
+ ) {
+ const config = Object.assign(defaultPluginConfig)
+ config.external.push(bsPlugins.Manipulator)
+ config.globals[bsPlugins.Manipulator] = 'Manipulator'
+ return config
}
- // Do not bundle Util in plugins
- if (plugin !== 'Util') {
- external.push(bsPlugins.Util)
- globals[bsPlugins.Util] = 'Util'
+ if (pluginKey === 'Dropdown' || pluginKey === 'Tooltip') {
+ const config = Object.assign(defaultPluginConfig)
+ config.external.push(bsPlugins.Manipulator, 'popper.js')
+ config.globals[bsPlugins.Manipulator] = 'Manipulator'
+ config.globals['popper.js'] = 'Popper'
+ return config
}
- // Do not bundle Tooltip in Popover
- if (plugin === 'Popover') {
- external.push(bsPlugins.Tooltip)
- globals[bsPlugins.Tooltip] = 'Tooltip'
+ if (pluginKey === 'Popover') {
+ return {
+ external: [
+ bsPlugins.Data,
+ bsPlugins.SelectorEngine,
+ bsPlugins.Tooltip,
+ bsPlugins.Util
+ ],
+ globals: {
+ [bsPlugins.Data]: 'Data',
+ [bsPlugins.SelectorEngine]: 'SelectorEngine',
+ [bsPlugins.Tooltip]: 'Tooltip',
+ [bsPlugins.Util]: 'Util'
+ }
+ }
}
+}
+
+function build(plugin) {
+ console.log(`Building ${plugin} plugin...`)
+
+ const config = getConfigByPluginKey(plugin)
+ const external = config.external
+ const globals = config.globals
+
+ const pluginPath = [
+ 'Data',
+ 'EventHandler',
+ 'Manipulator',
+ 'Polyfill',
+ 'SelectorEngine'
+ ].includes(plugin) ? `${rootPath}/dom/` : rootPath
const pluginFilename = `${plugin.toLowerCase()}.js`
@@ -75,7 +166,7 @@ function build(plugin) {
name: plugin,
sourcemap: true,
globals,
- file: path.resolve(__dirname, `${rootPath}${pluginFilename}`)
+ file: path.resolve(__dirname, `${pluginPath}${pluginFilename}`)
})
.then(() => console.log(`Building ${plugin} plugin... Done!`))
.catch((err) => console.error(`${plugin}: ${err}`))
diff --git a/js/src/alert.js b/js/src/alert.js
index bc368ae622..a8d0cc5da9 100644
--- a/js/src/alert.js
+++ b/js/src/alert.js
@@ -140,6 +140,16 @@ class Alert {
})
}
+ static _handleDismiss(alertInstance) {
+ return function (event) {
+ if (event) {
+ event.preventDefault()
+ }
+
+ alertInstance.close(this)
+ }
+ }
+
static _getInstance(element) {
return Data.getData(element, DATA_KEY)
}
diff --git a/js/src/carousel.js b/js/src/carousel.js
index 32a039c49d..9ff7c09e72 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -178,7 +178,7 @@ class Carousel {
this._interval = null
}
- if (this._config.interval && !this._isPaused) {
+ if (this._config && this._config.interval && !this._isPaused) {
this._interval = setInterval(
(document.visibilityState ? this.nextWhenVisible : this.next).bind(this),
this._config.interval
@@ -298,7 +298,7 @@ class Carousel {
}
const end = (event) => {
- if (this._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {
+ if (this._pointerEvent && PointerType[event.pointerType.toUpperCase()]) {
this.touchDeltaX = event.clientX - this.touchStartX
}
@@ -464,6 +464,14 @@ class Carousel {
activeElement.classList.add(directionalClassName)
nextElement.classList.add(directionalClassName)
+ const nextElementInterval = parseInt(nextElement.getAttribute('data-interval'), 10)
+ if (nextElementInterval) {
+ this._config.defaultInterval = this._config.defaultInterval || this._config.interval
+ this._config.interval = nextElementInterval
+ } else {
+ this._config.interval = this._config.defaultInterval || this._config.interval
+ }
+
const transitionDuration = Util.getTransitionDurationFromElement(activeElement)
EventHandler
diff --git a/js/src/dom/data.js b/js/src/dom/data.js
index 2c11151257..2dfaad91a4 100644
--- a/js/src/dom/data.js
+++ b/js/src/dom/data.js
@@ -1,6 +1,6 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): dom/data.js
+ * Bootstrap (v4.1.3): dom/data.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/dom/eventHandler.js b/js/src/dom/eventHandler.js
index 17f6d077a6..259f575ed9 100644
--- a/js/src/dom/eventHandler.js
+++ b/js/src/dom/eventHandler.js
@@ -3,7 +3,7 @@ import Util from '../util'
/**
* --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): dom/eventHandler.js
+ * Bootstrap (v4.1.3): dom/eventHandler.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -32,6 +32,7 @@ const EventHandler = (() => {
'keydown', 'keypress', 'keyup',
'orientationchange',
'touchstart', 'touchmove', 'touchend', 'touchcancel',
+ 'pointerdown', 'pointermove', 'pointerup', 'pointerleave', 'pointercancel',
'gesturestart', 'gesturechange', 'gestureend',
'focus', 'blur', 'change', 'reset', 'select', 'submit', 'focusin', 'focusout',
'load', 'unload', 'beforeunload', 'resize', 'move', 'DOMContentLoaded', 'readystatechange',
@@ -314,4 +315,19 @@ const EventHandler = (() => {
}
})()
+/* istanbul ignore next */
+// focusin and focusout polyfill
+if (Polyfill.focusIn) {
+ (() => {
+ function listenerFocus(event) {
+ EventHandler.trigger(event.target, 'focusin')
+ }
+ function listenerBlur(event) {
+ EventHandler.trigger(event.target, 'focusout')
+ }
+ EventHandler.on(document, 'focus', 'input', listenerFocus)
+ EventHandler.on(document, 'blur', 'input', listenerBlur)
+ })()
+}
+
export default EventHandler
diff --git a/js/src/dom/manipulator.js b/js/src/dom/manipulator.js
index db3113f88d..ad14e29148 100644
--- a/js/src/dom/manipulator.js
+++ b/js/src/dom/manipulator.js
@@ -1,6 +1,6 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): dom/manipulator.js
+ * Bootstrap (v4.1.3): dom/manipulator.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/dom/polyfill.js b/js/src/dom/polyfill.js
index c0c1139f03..45defb76e7 100644
--- a/js/src/dom/polyfill.js
+++ b/js/src/dom/polyfill.js
@@ -2,7 +2,7 @@ import Util from '../util'
/**
* --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): dom/polyfill.js
+ * Bootstrap (v4.1.3): dom/polyfill.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/dom/selectorEngine.js b/js/src/dom/selectorEngine.js
index 55d2ce4bbc..c2eec95a7e 100644
--- a/js/src/dom/selectorEngine.js
+++ b/js/src/dom/selectorEngine.js
@@ -3,7 +3,7 @@ import Util from '../util'
/**
* --------------------------------------------------------------------------
- * Bootstrap (v4.1.1): dom/selectorEngine.js
+ * Bootstrap (v4.1.3): dom/selectorEngine.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 6a4fb9e013..9a22a69916 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -234,7 +234,7 @@ class Dropdown {
Manipulator.toggleClass(this._menu, ClassName.SHOW)
Manipulator.toggleClass(parent, ClassName.SHOW)
- EventHandler.trigger(parent, Event.SHOWN, relatedTarget)
+ EventHandler.trigger(parent, Event.HIDDEN, relatedTarget)
}
dispose() {
diff --git a/js/src/index.js b/js/src/index.js
index 0c662873df..aa35ed07b3 100644
--- a/js/src/index.js
+++ b/js/src/index.js
@@ -3,9 +3,7 @@ import Button from './button'
import Carousel from './carousel'
import Collapse from './collapse'
import Dropdown from './dropdown'
-import EventHandler from './dom/eventHandler'
import Modal from './modal'
-import Polyfill from './dom/polyfill'
import Popover from './popover'
import ScrollSpy from './scrollspy'
import Tab from './tab'
@@ -20,21 +18,6 @@ import Util from './util'
* --------------------------------------------------------------------------
*/
-/* istanbul ignore next */
-// focusin and focusout polyfill
-if (Polyfill.focusIn) {
- (() => {
- function listenerFocus(event) {
- EventHandler.trigger(event.target, 'focusin')
- }
- function listenerBlur(event) {
- EventHandler.trigger(event.target, 'focusout')
- }
- EventHandler.on(document, 'focus', 'input', listenerFocus)
- EventHandler.on(document, 'blur', 'input', listenerBlur)
- })()
-}
-
export {
Util,
Alert,
diff --git a/js/src/modal.js b/js/src/modal.js
index 34aa56606c..8e56fc5b29 100644
--- a/js/src/modal.js
+++ b/js/src/modal.js
@@ -119,7 +119,7 @@ class Modal {
relatedTarget
})
- if (this._isShown || showEvent.isDefaultPrevented()) {
+ if (this._isShown || showEvent.defaultPrevented) {
return
}
@@ -161,7 +161,7 @@ class Modal {
const hideEvent = EventHandler.trigger(this._element, Event.HIDE)
- if (!this._isShown || hideEvent.isDefaultPrevented()) {
+ if (!this._isShown || hideEvent.defaultPrevented) {
return
}
@@ -282,16 +282,14 @@ class Modal {
}
_enforceFocus() {
- if (this._isShown && this._config.keyboard) {
- EventHandler.on(this._element, Event.KEYDOWN_DISMISS, (event) => {
- if (event.which === ESCAPE_KEYCODE) {
- event.preventDefault()
- this.hide()
- }
- })
- } else if (!this._isShown) {
- EventHandler.off(this._element, Event.KEYDOWN_DISMISS)
- }
+ EventHandler.off(document, Event.FOCUSIN) // guard against infinite focus loop
+ EventHandler.on(document, Event.FOCUSIN, (event) => {
+ if (document !== event.target &&
+ this._element !== event.target &&
+ !this._element.contains(event.target)) {
+ this._element.focus()
+ }
+ })
}
_setEscapeEvent() {
@@ -383,7 +381,7 @@ class Modal {
const backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop)
EventHandler.one(this._backdrop, Util.TRANSITION_END, callback)
- Util.emulateTransitionEnd(backdropTransitionDuration)
+ Util.emulateTransitionEnd(this._backdrop, backdropTransitionDuration)
} else if (!this._isShown && this._backdrop) {
this._backdrop.classList.remove(ClassName.SHOW)
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index 29394b9484..93880bb8e4 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -682,8 +682,7 @@ class Tooltip {
}
})
- if (typeof config !== 'undefined' &&
- typeof config.container === 'object' && config.container.jquery) {
+ if (config && typeof config.container === 'object' && config.container.jquery) {
config.container = config.container[0]
}
diff --git a/js/src/util.js b/js/src/util.js
index 7a97411bbf..caa2e63485 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -5,8 +5,6 @@
* --------------------------------------------------------------------------
*/
-import EventHandler from './dom/eventHandler'
-
/**
* ------------------------------------------------------------------------
* Private TransitionEnd Helpers
diff --git a/js/tests/index.html b/js/tests/index.html
index d0ff5b82b6..77c29f8f85 100644
--- a/js/tests/index.html
+++ b/js/tests/index.html
@@ -97,12 +97,12 @@
</script>
<!-- Transpiled Plugins -->
+ <script src="../dist/util.js"></script>
<script src="../dist/dom/polyfill.js"></script>
<script src="../dist/dom/manipulator.js"></script>
<script src="../dist/dom/eventHandler.js"></script>
<script src="../dist/dom/selectorEngine.js"></script>
<script src="../dist/dom/data.js"></script>
- <script src="../dist/util.js"></script>
<script src="../dist/alert.js"></script>
<script src="../dist/button.js"></script>
<script src="../dist/carousel.js"></script>
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index 469a95561f..641ac88949 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -93,12 +93,12 @@ if (bundle) {
reporters.push('BrowserStack')
files = files.concat([
'node_modules/jquery/dist/jquery.slim.min.js',
+ 'js/coverage/dist/util.js',
+ 'js/coverage/dist/dom/polyfill.js',
'js/coverage/dist/dom/eventHandler.js',
'js/coverage/dist/dom/selectorEngine.js',
'js/coverage/dist/dom/data.js',
'js/coverage/dist/dom/manipulator.js',
- 'js/coverage/dist/util.js',
- 'js/coverage/dist/dom/polyfill.js',
'js/coverage/dist/dom/!(polyfill).js',
'js/coverage/dist/tooltip.js',
'js/coverage/dist/!(util|index|tooltip).js', // include all of our js/dist files except util.js, index.js and tooltip.js
@@ -115,12 +115,12 @@ if (bundle) {
)
files = files.concat([
jqueryFile,
+ 'js/coverage/dist/util.js',
+ 'js/coverage/dist/dom/polyfill.js',
'js/coverage/dist/dom/eventHandler.js',
'js/coverage/dist/dom/selectorEngine.js',
'js/coverage/dist/dom/data.js',
'js/coverage/dist/dom/manipulator.js',
- 'js/coverage/dist/util.js',
- 'js/coverage/dist/dom/polyfill.js',
'js/coverage/dist/dom/!(polyfill).js',
'js/coverage/dist/tooltip.js',
'js/coverage/dist/!(util|index|tooltip).js', // include all of our js/dist files except util.js, index.js and tooltip.js
diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js
index 9016f61abb..3db83eaa38 100644
--- a/js/tests/unit/carousel.js
+++ b/js/tests/unit/carousel.js
@@ -541,16 +541,19 @@ $(function () {
'<a class="left carousel-control" href="#myCarousel" data-slide="prev">&lsaquo;</a>' +
'<a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</a>' +
'</div>'
- var $carousel = $(templateHTML)
- $carousel.appendTo('body')
+ var $carousel = $(templateHTML).appendTo('#qunit-fixture')
$carousel.bootstrapCarousel(1)
- assert.strictEqual($carousel.data('bs.carousel')._config.interval, 3814)
+ var carousel = Carousel._getInstance($carousel[0])
+ assert.strictEqual(carousel._config.interval, 3814)
+ carousel.dispose()
$carousel.remove()
- $carousel.appendTo('body')
+ $carousel = $carousel.appendTo('#qunit-fixture')
$carousel.bootstrapCarousel(2)
- assert.strictEqual($carousel.data('bs.carousel')._config.interval, 1814, 'reverts to default interval if no data-interval is set')
+ carousel = Carousel._getInstance($carousel[0])
+
+ assert.strictEqual(carousel._config.interval, 1814, 'reverts to default interval if no data-interval is set')
$carousel.remove()
})
@@ -1080,7 +1083,7 @@ $(function () {
var $carousel = $(carouselHTML).appendTo('#qunit-fixture')
var $item = $('#item')
$carousel.bootstrapCarousel()
- var carousel = $carousel.data('bs.carousel')
+ var carousel = Carousel._getInstance($carousel[0])
var spy = sinon.spy(carousel, 'prev')
$carousel.one('slid.bs.carousel', function () {
@@ -1122,7 +1125,7 @@ $(function () {
$carousel.appendTo('#qunit-fixture')
var $item = $('#item')
$carousel.bootstrapCarousel()
- var carousel = $carousel.data('bs.carousel')
+ var carousel = Carousel._getInstance($carousel[0])
var spy = sinon.spy(carousel, 'prev')
$carousel.one('slid.bs.carousel', function () {
@@ -1169,7 +1172,7 @@ $(function () {
$carousel.appendTo('#qunit-fixture')
var $item = $('#item')
$carousel.bootstrapCarousel()
- var carousel = $carousel.data('bs.carousel')
+ var carousel = Carousel._getInstance($carousel[0])
var spy = sinon.spy(carousel, 'next')
$carousel.one('slid.bs.carousel', function () {
@@ -1212,7 +1215,7 @@ $(function () {
$carousel.appendTo('#qunit-fixture')
var $item = $('#item')
$carousel.bootstrapCarousel()
- var carousel = $carousel.data('bs.carousel')
+ var carousel = Carousel._getInstance($carousel[0])
var spy = sinon.spy(carousel, 'next')
$carousel.one('slid.bs.carousel', function () {
@@ -1264,7 +1267,7 @@ $(function () {
$carousel.appendTo('#qunit-fixture')
$carousel.bootstrapCarousel()
- var carousel = $carousel.data('bs.carousel')
+ var carousel = Carousel._getInstance($carousel[0])
var spy = sinon.spy(carousel, '_slide')
@@ -1283,7 +1286,7 @@ $(function () {
$carousel.appendTo('#qunit-fixture')
$carousel.bootstrapCarousel()
- var carousel = $carousel.data('bs.carousel')
+ var carousel = Carousel._getInstance($carousel[0])
var spy = sinon.spy(carousel, 'next')
var sandbox = sinon.createSandbox()
diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js
index a9a5773e61..3c1c9d03df 100644
--- a/js/tests/unit/dropdown.js
+++ b/js/tests/unit/dropdown.js
@@ -517,7 +517,7 @@ $(function () {
$(document.body).trigger('click')
})
- $dropdown.trigger('click')
+ $dropdown[0].click()
})
QUnit.test('should fire hide and hidden event without a clickEvent if event type is not click', function (assert) {
@@ -547,12 +547,13 @@ $(function () {
})
.on('shown.bs.dropdown', function () {
assert.ok(true, 'shown was fired')
- $dropdown.trigger($.Event('keydown', {
- which: 27
- }))
+
+ var keyDown = new Event('keydown')
+ keyDown.which = 27
+ $dropdown[0].dispatchEvent(keyDown)
})
- $dropdown.trigger('click')
+ $dropdown[0].click()
})
QUnit.test('should ignore keyboard events within <input>s and <textarea>s', function (assert) {
@@ -1132,7 +1133,7 @@ $(function () {
assert.ok(dropdown._element === null)
})
- QUnit.test('should show dropdown', function (assert) {
+ QUnit.test('should hide dropdown', function (assert) {
assert.expect(2)
var dropdownHTML =
@@ -1148,44 +1149,14 @@ $(function () {
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
- var dropdown = $dropdown.data('bs.dropdown')
+ var dropdown = Dropdown._getInstance($dropdown[0])
var done = assert.async()
$dropdown
.parent('.dropdown')
- .on('show.bs.dropdown', function () {
- assert.ok(true, 'show was fired')
- })
.on('shown.bs.dropdown', function () {
- assert.ok($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is shown')
- done()
+ dropdown.hide()
})
-
- dropdown.show()
- })
-
- QUnit.test('should hide dropdown', function (assert) {
- assert.expect(2)
-
- var dropdownHTML =
- '<div class="dropdown">' +
- ' <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' +
- ' <div class="dropdown-menu">' +
- ' <a class="dropdown-item" href="#">Another link</a>' +
- ' </div>' +
- '</div>'
-
- var $dropdown = $(dropdownHTML)
- .appendTo('#qunit-fixture')
- .find('[data-toggle="dropdown"]')
- .bootstrapDropdown()
-
- var dropdown = $dropdown.data('bs.dropdown')
- var done = assert.async()
- $dropdown.trigger('click')
-
- $dropdown
- .parent('.dropdown')
.on('hide.bs.dropdown', function () {
assert.ok(true, 'hide was fired')
})
@@ -1194,7 +1165,7 @@ $(function () {
done()
})
- dropdown.hide()
+ dropdown.show()
})
QUnit.test('should not hide dropdown', function (assert) {
@@ -1213,7 +1184,7 @@ $(function () {
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
- var dropdown = $dropdown.data('bs.dropdown')
+ var dropdown = Dropdown._getInstance($dropdown[0])
$dropdown.trigger('click')
dropdown.show()
@@ -1236,7 +1207,7 @@ $(function () {
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
- var dropdown = $dropdown.data('bs.dropdown')
+ var dropdown = Dropdown._getInstance($dropdown[0])
dropdown.hide()
assert.ok(!$dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is still hidden')
})
@@ -1257,7 +1228,7 @@ $(function () {
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
- var dropdown = $dropdown.data('bs.dropdown')
+ var dropdown = Dropdown._getInstance($dropdown[0])
var done = assert.async()
$dropdown
@@ -1289,7 +1260,7 @@ $(function () {
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
- var dropdown = $dropdown.data('bs.dropdown')
+ var dropdown = Dropdown._getInstance($dropdown[0])
var done = assert.async()
$dropdown
@@ -1319,19 +1290,21 @@ $(function () {
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
- var dropdown = $dropdown.data('bs.dropdown')
+ var dropdown = Dropdown._getInstance($dropdown[0])
var done = assert.async()
- $dropdown.trigger('click')
$dropdown
.parent('.dropdown')
+ .on('shown.bs.dropdown', function () {
+ dropdown.hide()
+ })
.on('hide.bs.dropdown', function (event) {
event.preventDefault()
+ assert.ok($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is shown')
done()
})
- dropdown.hide()
- assert.ok($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is shown')
+ dropdown.show()
})
QUnit.test('should not open dropdown via show method if target is disabled via attribute', function (assert) {
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js
index 0739f03782..dacb1fb8d7 100644
--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
@@ -2,6 +2,7 @@ $(function () {
'use strict'
window.Util = typeof bootstrap !== 'undefined' ? bootstrap.Util : Util
+ var Modal = typeof window.bootstrap !== 'undefined' ? window.bootstrap.Modal : window.Modal
QUnit.module('modal plugin')
@@ -624,43 +625,6 @@ $(function () {
assert.ok(evt.defaultPrevented, 'model shown instead of navigating to href')
})
- QUnit.test('should not parse target as html', function (assert) {
- assert.expect(1)
- var done = assert.async()
-
- var $toggleBtn = $('<button data-toggle="modal" data-target="&lt;div id=&quot;modal-test&quot;&gt;&lt;div class=&quot;contents&quot;&lt;div&lt;div id=&quot;close&quot; data-dismiss=&quot;modal&quot;/&gt;&lt;/div&gt;&lt;/div&gt;"/>')
- .appendTo('#qunit-fixture')
-
- $toggleBtn.trigger('click')
- setTimeout(function () {
- assert.strictEqual($('#modal-test').length, 0, 'target has not been parsed and added to the document')
- done()
- }, 0)
- })
-
- QUnit.test('should not execute js from target', function (assert) {
- assert.expect(0)
- var done = assert.async()
-
- // This toggle button contains XSS payload in its data-target
- // Note: it uses the onerror handler of an img element to execute the js, because a simple script element does not work here
- // a script element works in manual tests though, so here it is likely blocked by the qunit framework
- var $toggleBtn = $('<button data-toggle="modal" data-target="&lt;div&gt;&lt;image src=&quot;missing.png&quot; onerror=&quot;$(&apos;#qunit-fixture button.control&apos;).trigger(&apos;click&apos;)&quot;&gt;&lt;/div&gt;"/>')
- .appendTo('#qunit-fixture')
- // The XSS payload above does not have a closure over this function and cannot access the assert object directly
- // However, it can send a click event to the following control button, which will then fail the assert
- $('<button>')
- .addClass('control')
- .on('click', function () {
- assert.notOk(true, 'XSS payload is not executed as js')
- })
- .appendTo('#qunit-fixture')
-
- $toggleBtn.trigger('click')
-
- setTimeout(done, 500)
- })
-
QUnit.test('should not try to open a modal which is already visible', function (assert) {
assert.expect(1)
var done = assert.async()
@@ -717,7 +681,7 @@ $(function () {
})
QUnit.test('should dispose modal', function (assert) {
- assert.expect(3)
+ assert.expect(2)
var done = assert.async()
var $modal = $([
@@ -731,31 +695,19 @@ $(function () {
].join('')).appendTo('#qunit-fixture')
$modal.on('shown.bs.modal', function () {
- var spy = sinon.spy($.fn, 'off')
-
- $(this).bootstrapModal('dispose')
+ var modal = Modal._getInstance($modal[0])
+ var spy = sinon.spy($modal[0], 'removeEventListener')
- var modalDataApiEvent = []
- $._data(document, 'events').click
- .forEach(function (e) {
- if (e.namespace === 'bs.data-api.modal') {
- modalDataApiEvent.push(e)
- }
- })
+ modal.dispose()
- assert.ok(typeof $(this).data('bs.modal') === 'undefined', 'modal data object was disposed')
-
- assert.ok(spy.callCount === 4, '`jQuery.off` was called')
-
- assert.ok(modalDataApiEvent.length === 1, '`Event.CLICK_DATA_API` on `document` was not removed')
-
- $.fn.off.restore()
+ assert.ok(!Modal._getInstance($modal[0]), 'modal data object was disposed')
+ assert.ok(spy.called)
done()
}).bootstrapModal('show')
})
QUnit.test('should enforce focus', function (assert) {
- assert.expect(4)
+ assert.expect(2)
var done = assert.async()
var $modal = $([
@@ -770,27 +722,26 @@ $(function () {
.bootstrapModal()
.appendTo('#qunit-fixture')
- var modal = $modal.data('bs.modal')
+ var modal = Modal._getInstance($modal[0])
var spy = sinon.spy(modal, '_enforceFocus')
- var spyDocOff = sinon.spy($(document), 'off')
- var spyDocOn = sinon.spy($(document), 'on')
$modal.one('shown.bs.modal', function () {
assert.ok(spy.called, '_enforceFocus called')
- assert.ok(spyDocOff.withArgs('focusin.bs.modal'))
- assert.ok(spyDocOn.withArgs('focusin.bs.modal'))
-
var spyFocus = sinon.spy(modal._element, 'focus')
- var event = $.Event('focusin', {
- target: $('#qunit-fixture')[0]
- })
- $(document).one('focusin', function () {
+ function focusInListener() {
assert.ok(spyFocus.called)
+ document.removeEventListener('focusin', focusInListener)
done()
+ }
+ document.addEventListener('focusin', focusInListener)
+
+ var focusInEvent = new Event('focusin')
+ Object.defineProperty(focusInEvent, 'target', {
+ value: $('#qunit-fixture')[0]
})
- $(document).trigger(event)
+ document.dispatchEvent(focusInEvent)
})
.bootstrapModal('show')
})
diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js
index 23cd0cafd5..47425dd57f 100644
--- a/js/tests/unit/tooltip.js
+++ b/js/tests/unit/tooltip.js
@@ -1034,7 +1034,7 @@ $(function () {
var $tipTest = $('<div class="bs-tooltip" />')
.appendTo('#qunit-fixture')
- var tooltip = $tooltip.data('bs.tooltip')
+ var tooltip = Tooltip._getInstance($tooltip[0])
tooltip.tip = null
tooltip._handlePopperPlacementChange({
@@ -1054,7 +1054,7 @@ $(function () {
.appendTo('#qunit-fixture')
.bootstrapTooltip()
- var tooltip = $tooltip.data('bs.tooltip')
+ var tooltip = Tooltip._getInstance($tooltip[0])
assert.strictEqual(tooltip._isEnabled, true)
diff --git a/js/tests/visual/alert.html b/js/tests/visual/alert.html
index 8b073a9fc1..2e0733c425 100644
--- a/js/tests/visual/alert.html
+++ b/js/tests/visual/alert.html
@@ -51,11 +51,11 @@
</div>
</div>
+ <script src="../../dist/util.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/eventHandler.js"></script>
<script src="../../dist/dom/selectorEngine.js"></script>
<script src="../../dist/dom/data.js"></script>
- <script src="../../dist/util.js"></script>
<script src="../../dist/alert.js"></script>
</body>
</html>
diff --git a/js/tests/visual/carousel.html b/js/tests/visual/carousel.html
index 42e81df6c0..fba62866d1 100644
--- a/js/tests/visual/carousel.html
+++ b/js/tests/visual/carousel.html
@@ -45,6 +45,7 @@
</div>
</div>
+ <script src="../../dist/util.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
<script src="../../dist/dom/eventHandler.js"></script>
diff --git a/js/tests/visual/collapse.html b/js/tests/visual/collapse.html
index e905e451a1..1d6533a3ca 100644
--- a/js/tests/visual/collapse.html
+++ b/js/tests/visual/collapse.html
@@ -71,12 +71,12 @@
</div>
</div>
+ <script src="../../dist/util.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
<script src="../../dist/dom/eventHandler.js"></script>
<script src="../../dist/dom/selectorEngine.js"></script>
<script src="../../dist/dom/data.js"></script>
- <script src="../../dist/util.js"></script>
<script src="../../dist/collapse.js"></script>
</body>
</html>
diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html
index 951aefa96e..c6f8387a64 100644
--- a/js/tests/visual/dropdown.html
+++ b/js/tests/visual/dropdown.html
@@ -210,12 +210,12 @@
</div>
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
+ <script src="../../dist/util.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/eventHandler.js"></script>
<script src="../../dist/dom/data.js"></script>
<script src="../../dist/dom/selectorEngine.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
- <script src="../../dist/util.js"></script>
<script src="../../dist/dropdown.js"></script>
<script src="../../dist/collapse.js"></script>
</body>
diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index 1f0eb0d637..b37beeef38 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -206,12 +206,12 @@
</div>
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
+ <script src="../../dist/util.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/data.js"></script>
<script src="../../dist/dom/eventHandler.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
<script src="../../dist/dom/selectorEngine.js"></script>
- <script src="../../dist/util.js"></script>
<script src="../../dist/modal.js"></script>
<script src="../../dist/collapse.js"></script>
<script src="../../dist/tooltip.js"></script>
diff --git a/js/tests/visual/popover.html b/js/tests/visual/popover.html
index 676ca9448e..d408dbb903 100644
--- a/js/tests/visual/popover.html
+++ b/js/tests/visual/popover.html
@@ -32,12 +32,12 @@
</div>
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
+ <script src="../../dist/util.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
<script src="../../dist/dom/data.js"></script>
<script src="../../dist/dom/eventHandler.js"></script>
<script src="../../dist/dom/selectorEngine.js"></script>
- <script src="../../dist/util.js"></script>
<script src="../../dist/tooltip.js"></script>
<script src="../../dist/popover.js"></script>
<script>
diff --git a/js/tests/visual/scrollspy.html b/js/tests/visual/scrollspy.html
index 00def6a7c6..692d84cf4a 100644
--- a/js/tests/visual/scrollspy.html
+++ b/js/tests/visual/scrollspy.html
@@ -86,13 +86,12 @@
<p>Ad leggings keytar, brunch id art party dolor labore.</p>
</div>
- <script src="../../../site/docs/4.2/assets/js/vendor/popper.min.js"></script>
+ <script src="../../dist/util.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/data.js"></script>
<script src="../../dist/dom/eventHandler.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
<script src="../../dist/dom/selectorEngine.js"></script>
- <script src="../../dist/util.js"></script>
<script src="../../dist/scrollspy.js"></script>
<script src="../../dist/dropdown.js"></script>
<script src="../../dist/collapse.js"></script>
diff --git a/js/tests/visual/tab.html b/js/tests/visual/tab.html
index 7c6d95ee49..0b0582adda 100644
--- a/js/tests/visual/tab.html
+++ b/js/tests/visual/tab.html
@@ -226,12 +226,12 @@
</div>
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
+ <script src="../../dist/util.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/data.js"></script>
<script src="../../dist/dom/eventHandler.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
<script src="../../dist/dom/selectorEngine.js"></script>
- <script src="../../dist/util.js"></script>
<script src="../../dist/tab.js"></script>
<script src="../../dist/dropdown.js"></script>
</body>
diff --git a/js/tests/visual/tooltip.html b/js/tests/visual/tooltip.html
index d97f8d57a3..1cc5507a79 100644
--- a/js/tests/visual/tooltip.html
+++ b/js/tests/visual/tooltip.html
@@ -72,12 +72,12 @@
</div>
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
+ <script src="../../dist/util.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/manipulator.js"></script>
<script src="../../dist/dom/data.js"></script>
<script src="../../dist/dom/eventHandler.js"></script>
<script src="../../dist/dom/selectorEngine.js"></script>
- <script src="../../dist/util.js"></script>
<script src="../../dist/tooltip.js"></script>
<script>
document.addEventListener('DOMContentLoaded', function () {
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-19 19:58:30 +0300