mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-13 17:14:04 +02:00
alert without jquery
This commit is contained in:
@@ -5,7 +5,9 @@
|
|||||||
* --------------------------------------------------------------------------
|
* --------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import $ from 'jquery'
|
import Data from './dom/data'
|
||||||
|
import EventHandler from './dom/eventHandler'
|
||||||
|
import SelectorEngine from './dom/selectorEngine'
|
||||||
import Util from './util'
|
import Util from './util'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -64,7 +66,7 @@ class Alert {
|
|||||||
|
|
||||||
const customEvent = this._triggerCloseEvent(rootElement)
|
const customEvent = this._triggerCloseEvent(rootElement)
|
||||||
|
|
||||||
if (customEvent.isDefaultPrevented()) {
|
if (customEvent.defaultPrevented) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,7 +74,7 @@ class Alert {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dispose() {
|
dispose() {
|
||||||
$.removeData(this._element, DATA_KEY)
|
Data.removeData(this._element, DATA_KEY)
|
||||||
this._element = null
|
this._element = null
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,52 +89,45 @@ class Alert {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!parent) {
|
if (!parent) {
|
||||||
parent = $(element).closest(`.${ClassName.ALERT}`)[0]
|
parent = SelectorEngine.closest(element, `.${ClassName.ALERT}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
return parent
|
return parent
|
||||||
}
|
}
|
||||||
|
|
||||||
_triggerCloseEvent(element) {
|
_triggerCloseEvent(element) {
|
||||||
const closeEvent = $.Event(Event.CLOSE)
|
return EventHandler.trigger(element, Event.CLOSE)
|
||||||
|
|
||||||
$(element).trigger(closeEvent)
|
|
||||||
return closeEvent
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_removeElement(element) {
|
_removeElement(element) {
|
||||||
$(element).removeClass(ClassName.SHOW)
|
element.classList.remove(ClassName.SHOW)
|
||||||
|
|
||||||
if (!$(element).hasClass(ClassName.FADE)) {
|
if (!element.classList.contains(ClassName.FADE)) {
|
||||||
this._destroyElement(element)
|
this._destroyElement(element)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const transitionDuration = Util.getTransitionDurationFromElement(element)
|
const transitionDuration = Util.getTransitionDurationFromElement(element)
|
||||||
|
|
||||||
$(element)
|
EventHandler
|
||||||
.one(Util.TRANSITION_END, (event) => this._destroyElement(element, event))
|
.one(element, Util.TRANSITION_END, (event) => this._destroyElement(element, event))
|
||||||
|
Util.emulateTransitionEnd(element, transitionDuration)
|
||||||
Util.emulateTransitionEnd(transitionDuration)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_destroyElement(element) {
|
_destroyElement(element) {
|
||||||
$(element)
|
EventHandler.trigger(element, Event.CLOSED)
|
||||||
.detach()
|
element.parentNode.removeChild(element)
|
||||||
.trigger(Event.CLOSED)
|
|
||||||
.remove()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Static
|
// Static
|
||||||
|
|
||||||
static _jQueryInterface(config) {
|
static _jQueryInterface(config) {
|
||||||
return this.each(function () {
|
return this.each(function () {
|
||||||
const $element = $(this)
|
let data = Data.getData(this, DATA_KEY)
|
||||||
let data = $element.data(DATA_KEY)
|
|
||||||
|
|
||||||
if (!data) {
|
if (!data) {
|
||||||
data = new Alert(this)
|
data = new Alert(this)
|
||||||
$element.data(DATA_KEY, data)
|
Data.setData(this, DATA_KEY, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config === 'close') {
|
if (config === 'close') {
|
||||||
|
51
js/src/dom/data.js
Normal file
51
js/src/dom/data.js
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
/**
|
||||||
|
* --------------------------------------------------------------------------
|
||||||
|
* Bootstrap (v4.0.0-beta): dom/data.js
|
||||||
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||||
|
* --------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
|
const mapData = (() => {
|
||||||
|
const storeData = {}
|
||||||
|
return {
|
||||||
|
set(element, key, data) {
|
||||||
|
let id
|
||||||
|
if (element.key === undefined) {
|
||||||
|
element.key = {
|
||||||
|
key,
|
||||||
|
id
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
storeData[id] = data
|
||||||
|
},
|
||||||
|
get(element, key) {
|
||||||
|
if (element.key === undefined || element.key !== key) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
const keyProperties = element.key
|
||||||
|
return storeData[keyProperties.id]
|
||||||
|
},
|
||||||
|
delete(element, key) {
|
||||||
|
if (element.key === undefined || element.key !== key) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const keyProperties = element.key
|
||||||
|
delete storeData[keyProperties.id]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})()
|
||||||
|
|
||||||
|
const Data = {
|
||||||
|
setData(instance, key, data) {
|
||||||
|
mapData.set(instance, key, data)
|
||||||
|
},
|
||||||
|
getData(instance, key) {
|
||||||
|
mapData.get(instance, key)
|
||||||
|
},
|
||||||
|
removeData(instance, key) {
|
||||||
|
mapData.delete(instance, key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Data
|
@@ -1,13 +1,13 @@
|
|||||||
/**
|
/**
|
||||||
* --------------------------------------------------------------------------
|
* --------------------------------------------------------------------------
|
||||||
* Bootstrap (v4.0.0-beta): dom/event.js
|
* Bootstrap (v4.0.0-beta): dom/eventHandler.js
|
||||||
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||||
* --------------------------------------------------------------------------
|
* --------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const Event = {
|
const EventHandler = {
|
||||||
on(element, event, handler) {
|
on(element, event, handler) {
|
||||||
if (typeof event !== 'string') {
|
if (typeof event !== 'string' || typeof element === 'undefined') {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
element.addEventListener(event, handler, false)
|
element.addEventListener(event, handler, false)
|
||||||
@@ -19,12 +19,12 @@ const Event = {
|
|||||||
handler()
|
handler()
|
||||||
element.removeEventListener(event, complete, false)
|
element.removeEventListener(event, complete, false)
|
||||||
}
|
}
|
||||||
Event.on(element, event, complete)
|
EventHandler.on(element, event, complete)
|
||||||
},
|
},
|
||||||
|
|
||||||
trigger(element, event) {
|
trigger(element, event) {
|
||||||
if (typeof event !== 'string') {
|
if (typeof event !== 'string' || typeof element === 'undefined') {
|
||||||
return
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
const eventToDispatch = new CustomEvent(event, {
|
const eventToDispatch = new CustomEvent(event, {
|
||||||
@@ -32,7 +32,9 @@ const Event = {
|
|||||||
cancelable: true
|
cancelable: true
|
||||||
})
|
})
|
||||||
element.dispatchEvent(eventToDispatch)
|
element.dispatchEvent(eventToDispatch)
|
||||||
|
|
||||||
|
return eventToDispatch
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default Event
|
export default EventHandler
|
42
js/src/dom/selectorEngine.js
Normal file
42
js/src/dom/selectorEngine.js
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
/**
|
||||||
|
* --------------------------------------------------------------------------
|
||||||
|
* Bootstrap (v4.0.0-beta): dom/selectorEngine.js
|
||||||
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||||
|
* --------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
|
const SelectorEngine = {
|
||||||
|
matches: Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector,
|
||||||
|
|
||||||
|
find(selector) {
|
||||||
|
if (typeof selector !== 'string') {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
let selectorType = 'querySelectorAll'
|
||||||
|
if (selector.indexOf('#') === 0) {
|
||||||
|
selectorType = 'getElementById'
|
||||||
|
selector = selector.substr(1, selector.length)
|
||||||
|
}
|
||||||
|
return document[selectorType](selector)
|
||||||
|
},
|
||||||
|
|
||||||
|
closest(element, selector) {
|
||||||
|
let ancestor = element
|
||||||
|
if (!document.documentElement.contains(element)) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
do {
|
||||||
|
if (SelectorEngine.matches.call(ancestor, selector)) {
|
||||||
|
return ancestor
|
||||||
|
}
|
||||||
|
|
||||||
|
ancestor = ancestor.parentElement
|
||||||
|
} while (ancestor !== null)
|
||||||
|
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default SelectorEngine
|
@@ -5,7 +5,7 @@
|
|||||||
* --------------------------------------------------------------------------
|
* --------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import Event from './dom/event'
|
import EventHandler from './dom/eventHandler'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ------------------------------------------------------------------------
|
* ------------------------------------------------------------------------
|
||||||
@@ -78,7 +78,7 @@ const Util = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
triggerTransitionEnd(element) {
|
triggerTransitionEnd(element) {
|
||||||
Event.trigger(element, Util.TRANSITION_END)
|
EventHandler.trigger(element, Util.TRANSITION_END)
|
||||||
},
|
},
|
||||||
|
|
||||||
// TODO: Remove in v5
|
// TODO: Remove in v5
|
||||||
|
@@ -97,7 +97,9 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- Transpiled Plugins -->
|
<!-- Transpiled Plugins -->
|
||||||
<script src="../dist/dom/event.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/util.js"></script>
|
||||||
<script src="../dist/alert.js"></script>
|
<script src="../dist/alert.js"></script>
|
||||||
<script src="../dist/button.js"></script>
|
<script src="../dist/button.js"></script>
|
||||||
|
@@ -12,7 +12,8 @@
|
|||||||
"Button": false,
|
"Button": false,
|
||||||
"Carousel": false,
|
"Carousel": false,
|
||||||
"Simulator": false,
|
"Simulator": false,
|
||||||
"Toast": false
|
"Toast": false,
|
||||||
|
"EventHandler": false
|
||||||
},
|
},
|
||||||
"parserOptions": {
|
"parserOptions": {
|
||||||
"ecmaVersion": 5,
|
"ecmaVersion": 5,
|
||||||
|
@@ -70,16 +70,19 @@ $(function () {
|
|||||||
QUnit.test('should not fire closed when close is prevented', function (assert) {
|
QUnit.test('should not fire closed when close is prevented', function (assert) {
|
||||||
assert.expect(1)
|
assert.expect(1)
|
||||||
var done = assert.async()
|
var done = assert.async()
|
||||||
$('<div class="alert"/>')
|
var $alert = $('<div class="alert"/>')
|
||||||
.on('close.bs.alert', function (e) {
|
$alert.appendTo('#qunit-fixture')
|
||||||
|
|
||||||
|
EventHandler.on($alert[0], 'close.bs.alert', function (e) {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
assert.ok(true, 'close event fired')
|
assert.ok(true, 'close event fired')
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
.on('closed.bs.alert', function () {
|
EventHandler.on($alert[0], 'closed.bs.alert', function () {
|
||||||
assert.ok(false, 'closed event fired')
|
assert.ok(false, 'closed event fired')
|
||||||
})
|
})
|
||||||
.bootstrapAlert('close')
|
|
||||||
|
$alert.bootstrapAlert('close')
|
||||||
})
|
})
|
||||||
|
|
||||||
QUnit.test('close should use internal _element if no element provided', function (assert) {
|
QUnit.test('close should use internal _element if no element provided', function (assert) {
|
||||||
|
@@ -52,7 +52,9 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../dist/dom/event.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/util.js"></script>
|
||||||
<script src="../../dist/alert.js"></script>
|
<script src="../../dist/alert.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
@@ -45,7 +45,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../dist/dom/event.js"></script>
|
<script src="../../dist/dom/eventHandler.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/button.js"></script>
|
<script src="../../dist/button.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
@@ -46,7 +46,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../dist/dom/event.js"></script>
|
<script src="../../dist/dom/eventHandler.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/carousel.js"></script>
|
<script src="../../dist/carousel.js"></script>
|
||||||
<script>
|
<script>
|
||||||
|
@@ -72,7 +72,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../dist/dom/event.js"></script>
|
<script src="../../dist/dom/eventHandler.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/collapse.js"></script>
|
<script src="../../dist/collapse.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
@@ -205,7 +205,7 @@
|
|||||||
|
|
||||||
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
||||||
<script src="../../dist/dom/event.js"></script>
|
<script src="../../dist/dom/eventHandler.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/dropdown.js"></script>
|
<script src="../../dist/dropdown.js"></script>
|
||||||
<script src="../../dist/collapse.js"></script>
|
<script src="../../dist/collapse.js"></script>
|
||||||
|
@@ -207,13 +207,12 @@
|
|||||||
|
|
||||||
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
||||||
<script src="../../dist/dom/event.js"></script>
|
<script src="../../dist/dom/eventHandler.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/modal.js"></script>
|
<script src="../../dist/modal.js"></script>
|
||||||
<script src="../../dist/collapse.js"></script>
|
<script src="../../dist/collapse.js"></script>
|
||||||
<script src="../../dist/tooltip.js"></script>
|
<script src="../../dist/tooltip.js"></script>
|
||||||
<script src="../../dist/popover.js"></script>
|
<script src="../../dist/popover.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
var firefoxTestDone = false
|
var firefoxTestDone = false
|
||||||
function reportFirefoxTestResult(result) {
|
function reportFirefoxTestResult(result) {
|
||||||
|
@@ -33,11 +33,10 @@
|
|||||||
|
|
||||||
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
||||||
<script src="../../dist/dom/event.js"></script>
|
<script src="../../dist/dom/eventHandler.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/tooltip.js"></script>
|
<script src="../../dist/tooltip.js"></script>
|
||||||
<script src="../../dist/popover.js"></script>
|
<script src="../../dist/popover.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(function () {
|
$(function () {
|
||||||
$('[data-toggle="popover"]').popover()
|
$('[data-toggle="popover"]').popover()
|
||||||
|
@@ -88,7 +88,7 @@
|
|||||||
|
|
||||||
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../../site/docs/4.2/assets/js/vendor/popper.min.js"></script>
|
<script src="../../../site/docs/4.2/assets/js/vendor/popper.min.js"></script>
|
||||||
<script src="../../dist/dom/event.js"></script>
|
<script src="../../dist/dom/eventHandler.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/scrollspy.js"></script>
|
<script src="../../dist/scrollspy.js"></script>
|
||||||
<script src="../../dist/dropdown.js"></script>
|
<script src="../../dist/dropdown.js"></script>
|
||||||
|
@@ -227,7 +227,7 @@
|
|||||||
|
|
||||||
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
||||||
<script src="../../dist/dom/event.js"></script>
|
<script src="../../dist/dom/eventHandler.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/tab.js"></script>
|
<script src="../../dist/tab.js"></script>
|
||||||
<script src="../../dist/dropdown.js"></script>
|
<script src="../../dist/dropdown.js"></script>
|
||||||
|
Reference in New Issue
Block a user