kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Add back support for IE 11

This commit is contained in:
Johann-S 2019-03-16 16:10:23 +02:00 committed by XhmikosR
parent f7c1b1e683
commit 08679ac0b5
10 changed files with 214 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/build-plugins.js
View File

@ -31,7 +31,6 @@ 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'),
@ -69,7 +68,8 @@ function getConfigByPluginKey(pluginKey) {
if (
pluginKey === 'Data' ||
pluginKey === 'Manipulator' ||
pluginKey === 'Polyfill' ||
pluginKey === 'EventHandler' ||
pluginKey === 'SelectorEngine' ||
pluginKey === 'Util' ||
pluginKey === 'Sanitizer'
) {
@ -79,17 +79,6 @@ function getConfigByPluginKey(pluginKey) {
}
}
if (pluginKey === 'EventHandler' || pluginKey === 'SelectorEngine') {
return {
external: [
bsPlugins.Polyfill
],
globals: {
[bsPlugins.Polyfill]: 'Polyfill'
}
}
}
if (pluginKey === 'Alert' || pluginKey === 'Tab') {
return defaultPluginConfig
}
@ -161,7 +150,6 @@ function build(plugin) {
'Data',
'EventHandler',
'Manipulator',
'Polyfill',
'SelectorEngine'
]

10
js/src/button.js
View File

@ -166,12 +166,18 @@ EventHandler.on(document, Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, eve
EventHandler.on(document, Event.FOCUS_DATA_API, Selector.DATA_TOGGLE_CARROT, event => {
const button = SelectorEngine.closest(event.target, Selector.BUTTON)
button.classList.add(ClassName.FOCUS)
if (button) {
button.classList.add(ClassName.FOCUS)
}
})
EventHandler.on(document, Event.BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, event => {
const button = SelectorEngine.closest(event.target, Selector.BUTTON)
button.classList.remove(ClassName.FOCUS)
if (button) {
button.classList.remove(ClassName.FOCUS)
}
})
/**

6
js/src/dom/eventHandler.js
View File

@ -6,7 +6,7 @@
*/
import { jQuery as $ } from '../util/index'
import Polyfill from './polyfill'
import { createCustomEvent, defaultPreventedPreservedOnDispatch } from './polyfill'
/**
* ------------------------------------------------------------------------
@ -305,7 +305,7 @@ const EventHandler = {
evt = document.createEvent('HTMLEvents')
evt.initEvent(typeEvent, bubbles, true)
} else {
evt = new CustomEvent(event, {
evt = createCustomEvent(event, {
bubbles,
cancelable: true
})
@ -326,7 +326,7 @@ const EventHandler = {
if (defaultPrevented) {
evt.preventDefault()
if (!Polyfill.defaultPreventedPreservedOnDispatch) {
if (!defaultPreventedPreservedOnDispatch) {
Object.defineProperty(evt, 'defaultPrevented', {
get: () => true
})

207
js/src/dom/polyfill.js
View File

@ -1,3 +1,5 @@
/* istanbul ignore file */
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.3.1): dom/polyfill.js
@ -7,83 +9,144 @@
import { getUID } from '../util/index'
/* istanbul ignore next */
const Polyfill = (() => {
// MSEdge resets defaultPrevented flag upon dispatchEvent call if at least one listener is attached
const defaultPreventedPreservedOnDispatch = (() => {
const e = new CustomEvent('Bootstrap', {
cancelable: true
})
let { matches, closest } = Element.prototype
let find = Element.prototype.querySelectorAll
let findOne = Element.prototype.querySelector
let createCustomEvent = (eventName, params) => {
const cEvent = new CustomEvent(eventName, params)
const element = document.createElement('div')
element.addEventListener('Bootstrap', () => null)
return cEvent
}
e.preventDefault()
element.dispatchEvent(e)
return e.defaultPrevented
})()
if (typeof window.CustomEvent !== 'function') {
createCustomEvent = (eventName, params) => {
params = params || { bubbles: false, cancelable: false, detail: null }
let find = Element.prototype.querySelectorAll
let findOne = Element.prototype.querySelector
const evt = document.createEvent('CustomEvent')
const scopeSelectorRegex = /:scope\b/
const supportScopeQuery = (() => {
const element = document.createElement('div')
try {
element.querySelectorAll(':scope *')
} catch (error) {
return false
}
return true
})()
if (!supportScopeQuery) {
find = function (selector) {
if (!scopeSelectorRegex.test(selector)) {
return this.querySelectorAll(selector)
}
const hasId = Boolean(this.id)
if (!hasId) {
this.id = getUID('scope')
}
let nodeList = null
try {
selector = selector.replace(scopeSelectorRegex, `#${this.id}`)
nodeList = this.querySelectorAll(selector)
} finally {
if (!hasId) {
this.removeAttribute('id')
}
}
return nodeList
}
findOne = function (selector) {
if (!scopeSelectorRegex.test(selector)) {
return this.querySelector(selector)
}
const matches = find.call(this, selector)
if (typeof matches[0] !== 'undefined') {
return matches[0]
}
return null
}
evt.initCustomEvent(eventName, params.bubbles, params.cancelable, params.detail)
return evt
}
}
return {
defaultPreventedPreservedOnDispatch,
find,
findOne
}
const workingDefaultPrevented = (() => {
const e = document.createEvent('CustomEvent')
e.initEvent('Bootstrap', true, true)
e.preventDefault()
return e.defaultPrevented
})()
export default Polyfill
if (!workingDefaultPrevented) {
const origPreventDefault = Event.prototype.preventDefault
Event.prototype.preventDefault = function () {
if (!this.cancelable) {
return
}
origPreventDefault.call(this)
Object.defineProperty(this, 'defaultPrevented', {
get() {
return true
},
configurable: true
})
}
}
// MSEdge resets defaultPrevented flag upon dispatchEvent call if at least one listener is attached
const defaultPreventedPreservedOnDispatch = (() => {
const e = createCustomEvent('Bootstrap', {
cancelable: true
})
const element = document.createElement('div')
element.addEventListener('Bootstrap', () => null)
e.preventDefault()
element.dispatchEvent(e)
return e.defaultPrevented
})()
if (!matches) {
matches = Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector
}
if (!closest) {
closest = function (selector) {
let element = this
do {
if (matches.call(element, selector)) {
return element
}
element = element.parentElement || element.parentNode
} while (element !== null && element.nodeType === 1)
return null
}
}
const scopeSelectorRegex = /:scope\b/
const supportScopeQuery = (() => {
const element = document.createElement('div')
try {
element.querySelectorAll(':scope *')
} catch (error) {
return false
}
return true
})()
if (!supportScopeQuery) {
find = function (selector) {
if (!scopeSelectorRegex.test(selector)) {
return this.querySelectorAll(selector)
}
const hasId = Boolean(this.id)
if (!hasId) {
this.id = getUID('scope')
}
let nodeList = null
try {
selector = selector.replace(scopeSelectorRegex, `#${this.id}`)
nodeList = this.querySelectorAll(selector)
} finally {
if (!hasId) {
this.removeAttribute('id')
}
}
return nodeList
}
findOne = function (selector) {
if (!scopeSelectorRegex.test(selector)) {
return this.querySelector(selector)
}
const matches = find.call(this, selector)
if (typeof matches[0] !== 'undefined') {
return matches[0]
}
return null
}
}
export {
createCustomEvent,
find,
findOne,
matches,
closest,
defaultPreventedPreservedOnDispatch
}

7
js/src/dom/selectorEngine.js
View File

@ -5,7 +5,7 @@
* --------------------------------------------------------------------------
*/
import Polyfill from './polyfill'
import { find as findFn, findOne, matches, closest } from './polyfill'
import { makeArray } from '../util/index'
/**
@ -14,12 +14,11 @@ import { makeArray } from '../util/index'
* ------------------------------------------------------------------------
*/
const { find: findFn, findOne } = Polyfill
const NODE_TEXT = 3
const SelectorEngine = {
matches(element, selector) {
return element.matches(selector)
return matches.call(element, selector)
},
find(selector, element = document.documentElement) {
@ -72,7 +71,7 @@ const SelectorEngine = {
return null
}
return element.closest(selector)
return closest.call(element, selector)
},
prev(element, selector) {

5
js/src/util/index.js
View File

@ -71,7 +71,10 @@ const getTransitionDurationFromElement = element => {
}
const triggerTransitionEnd = element => {
element.dispatchEvent(new Event(TRANSITION_END))
const evt = document.createEvent('HTMLEvents')
evt.initEvent(TRANSITION_END, true, true)
element.dispatchEvent(evt)
}
const isElement = obj => (obj[0] || obj).nodeType

7
js/tests/browsers.js
View File

@ -30,6 +30,13 @@ const browsers = {
browser: 'Edge',
browser_version: 'latest'
},
ie11Win10: {
base: 'BrowserStack',
os: 'Windows',
os_version: '10',
browser: 'IE',
browser_version: '11.0'
},
chromeWin10: {
base: 'BrowserStack',
os: 'Windows',

9
js/tests/karma.conf.js
View File

@ -79,8 +79,9 @@ if (bundle) {
conf.detectBrowsers = detectBrowsers
files = files.concat([
jqueryFile,
'js/tests/unit/tests-polyfills.js',
'dist/js/bootstrap.js',
'js/tests/unit/*.js'
'js/tests/unit/!(tests-polyfills).js'
])
} else if (browserStack) {
conf.hostname = ip.address()
@ -97,6 +98,7 @@ if (bundle) {
reporters.push('BrowserStack')
files = files.concat([
jqueryFile,
'js/tests/unit/tests-polyfills.js',
'js/coverage/dist/util/util.js',
'js/coverage/dist/util/sanitizer.js',
'js/coverage/dist/dom/polyfill.js',
@ -107,7 +109,7 @@ if (bundle) {
'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
'js/tests/unit/*.js',
'js/tests/unit/!(tests-polyfills).js',
'js/tests/unit/dom/*.js',
'js/tests/unit/util/*.js'
])
@ -121,6 +123,7 @@ if (bundle) {
)
files = files.concat([
jqueryFile,
'js/tests/unit/tests-polyfills.js',
'js/coverage/dist/util/util.js',
'js/coverage/dist/util/sanitizer.js',
'js/coverage/dist/dom/polyfill.js',
@ -131,7 +134,7 @@ if (bundle) {
'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
'js/tests/unit/*.js',
'js/tests/unit/!(tests-polyfills).js',
'js/tests/unit/dom/*.js',
'js/tests/unit/util/*.js'
])

25
js/tests/unit/modal.js
View File

@ -731,7 +731,14 @@ $(function () {
})
QUnit.test('should enforce focus', function (assert) {
assert.expect(2)
var isIE11 = Boolean(window.MSInputMethodContext) && Boolean(document.documentMode)
if (isIE11) {
assert.expect(1)
} else {
assert.expect(2)
}
var done = assert.async()
var $modal = $([
@ -759,14 +766,18 @@ $(function () {
done()
}
document.addEventListener('focusin', focusInListener)
if (isIE11) {
done()
} else {
document.addEventListener('focusin', focusInListener)
var focusInEvent = new Event('focusin')
Object.defineProperty(focusInEvent, 'target', {
value: $('#qunit-fixture')[0]
})
var focusInEvent = new Event('focusin')
Object.defineProperty(focusInEvent, 'target', {
value: $('#qunit-fixture')[0]
})
document.dispatchEvent(focusInEvent)
document.dispatchEvent(focusInEvent)
}
})
.bootstrapModal('show')
})

28
js/tests/unit/tests-polyfills.js Normal file
View File

@ -0,0 +1,28 @@
// Polyfills for our unit tests
(function () {
'use strict'
// Event constructor shim
if (!window.Event || typeof window.Event !== 'function') {
var origEvent = window.Event
window.Event = function (inType, params) {
params = params || {}
var e = document.createEvent('Event')
e.initEvent(inType, Boolean(params.bubbles), Boolean(params.cancelable))
return e
}
window.Event.prototype = origEvent.prototype
}
if (typeof window.CustomEvent !== 'function') {
window.CustomEvent = function (event, params) {
params = params || { bubbles: false, cancelable: false, detail: null }
var evt = document.createEvent('CustomEvent')
evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail)
return evt
}
CustomEvent.prototype = window.Event.prototype
}
})()