mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-09 07:06:36 +02:00
Add Manipulator object to add shortcuts for dom manipulations
This commit is contained in:
@@ -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'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -93,7 +94,7 @@ class Button {
|
|||||||
rootElement.classList.contains('disabled')) {
|
rootElement.classList.contains('disabled')) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
input.checked = !this._element.classList.contains(ClassName.ACTIVE)
|
Manipulator.setChecked(input, !this._element.classList.contains(ClassName.ACTIVE))
|
||||||
EventHandler.trigger(input, 'change')
|
EventHandler.trigger(input, 'change')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -85,7 +85,7 @@ const nativeEvents = [
|
|||||||
'orientationchange',
|
'orientationchange',
|
||||||
'touchstart', 'touchmove', 'touchend', 'touchcancel',
|
'touchstart', 'touchmove', 'touchend', 'touchcancel',
|
||||||
'gesturestart', 'gesturechange', 'gestureend',
|
'gesturestart', 'gesturechange', 'gestureend',
|
||||||
'focus', 'blur', 'change', 'reset', 'select', 'submit',
|
'focus', 'blur', 'change', 'reset', 'select', 'submit', 'focusin', 'focusout',
|
||||||
'load', 'unload', 'beforeunload', 'resize', 'move', 'DOMContentLoaded', 'readystatechange',
|
'load', 'unload', 'beforeunload', 'resize', 'move', 'DOMContentLoaded', 'readystatechange',
|
||||||
'error', 'abort', 'scroll'
|
'error', 'abort', 'scroll'
|
||||||
]
|
]
|
||||||
|
24
js/src/dom/manipulator.js
Normal file
24
js/src/dom/manipulator.js
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
/**
|
||||||
|
* --------------------------------------------------------------------------
|
||||||
|
* Bootstrap (v4.0.0-beta): dom/manipulator.js
|
||||||
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||||
|
* --------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
|
const Manipulator = {
|
||||||
|
setChecked(input, val) {
|
||||||
|
if (input instanceof HTMLInputElement) {
|
||||||
|
input.checked = val
|
||||||
|
input.bsChecked = val
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
isChecked(input) {
|
||||||
|
if (input instanceof HTMLInputElement) {
|
||||||
|
return input.bsChecked || input.checked
|
||||||
|
}
|
||||||
|
throw new Error('INPUT parameter is not an HTMLInputElement')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Manipulator
|
@@ -100,6 +100,7 @@
|
|||||||
<script src="../dist/dom/eventHandler.js"></script>
|
<script src="../dist/dom/eventHandler.js"></script>
|
||||||
<script src="../dist/dom/selectorEngine.js"></script>
|
<script src="../dist/dom/selectorEngine.js"></script>
|
||||||
<script src="../dist/dom/data.js"></script>
|
<script src="../dist/dom/data.js"></script>
|
||||||
|
<script src="../dist/dom/manipulator.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>
|
||||||
|
@@ -14,7 +14,8 @@
|
|||||||
"Simulator": false,
|
"Simulator": false,
|
||||||
"Toast": false,
|
"Toast": false,
|
||||||
"EventHandler": false,
|
"EventHandler": false,
|
||||||
"Data": false
|
"Data": false,
|
||||||
|
"Manipulator": false
|
||||||
},
|
},
|
||||||
"parserOptions": {
|
"parserOptions": {
|
||||||
"ecmaVersion": 5,
|
"ecmaVersion": 5,
|
||||||
|
@@ -127,21 +127,21 @@ $(function () {
|
|||||||
assert.ok($btn1.hasClass('active'), 'btn1 has active class')
|
assert.ok($btn1.hasClass('active'), 'btn1 has active class')
|
||||||
assert.ok($btn1.find('input').prop('checked'), 'btn1 is checked')
|
assert.ok($btn1.find('input').prop('checked'), 'btn1 is checked')
|
||||||
assert.ok(!$btn2.hasClass('active'), 'btn2 does not have active class')
|
assert.ok(!$btn2.hasClass('active'), 'btn2 does not have active class')
|
||||||
assert.ok(!$btn2.find('input').prop('checked'), 'btn2 is not checked')
|
assert.ok(!Manipulator.isChecked($btn2.find('input')[0]), 'btn2 is not checked')
|
||||||
|
|
||||||
EventHandler.trigger($btn2.find('input')[0], 'click')
|
EventHandler.trigger($btn2.find('input')[0], 'click')
|
||||||
|
|
||||||
assert.ok(!$btn1.hasClass('active'), 'btn1 does not have active class')
|
assert.ok(!$btn1.hasClass('active'), 'btn1 does not have active class')
|
||||||
assert.ok(!$btn1.find('input').prop('checked'), 'btn1 is not checked')
|
assert.ok(!$btn1.find('input').prop('checked'), 'btn1 is not checked')
|
||||||
assert.ok($btn2.hasClass('active'), 'btn2 has active class')
|
assert.ok($btn2.hasClass('active'), 'btn2 has active class')
|
||||||
assert.ok($btn2.find('input').prop('checked'), 'btn2 is checked')
|
assert.ok(Manipulator.isChecked($btn2.find('input')[0]), 'btn2 is checked')
|
||||||
|
|
||||||
EventHandler.trigger($btn2.find('input')[0], 'click') // clicking an already checked radio should not un-check it
|
EventHandler.trigger($btn2.find('input')[0], 'click') // clicking an already checked radio should not un-check it
|
||||||
|
|
||||||
assert.ok(!$btn1.hasClass('active'), 'btn1 does not have active class')
|
assert.ok(!$btn1.hasClass('active'), 'btn1 does not have active class')
|
||||||
assert.ok(!$btn1.find('input').prop('checked'), 'btn1 is not checked')
|
assert.ok(!$btn1.find('input').prop('checked'), 'btn1 is not checked')
|
||||||
assert.ok($btn2.hasClass('active'), 'btn2 has active class')
|
assert.ok($btn2.hasClass('active'), 'btn2 has active class')
|
||||||
assert.ok($btn2.find('input').prop('checked'), 'btn2 is checked')
|
assert.ok(Manipulator.isChecked($btn2.find('input')[0]), 'btn2 is checked')
|
||||||
})
|
})
|
||||||
|
|
||||||
QUnit.test('should only toggle selectable inputs', function (assert) {
|
QUnit.test('should only toggle selectable inputs', function (assert) {
|
||||||
|
@@ -46,6 +46,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="../../dist/dom/eventHandler.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/dom/selectorEngine.js"></script>
|
||||||
<script src="../../dist/dom/data.js"></script>
|
<script src="../../dist/dom/data.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
|
Reference in New Issue
Block a user