diff options
author | Laussel Loïc <loic.laussel@orange.com> | 2020-10-02 17:40:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-02 17:40:20 +0300 |
commit | 24572b157793c0d762f56314786df18aba3d6212 (patch) | |
tree | a0854ce1b54b62b3cc92dd6935cad22330b85d5f | |
parent | d9b4426b0729d23105aa8597ed050aa7af647c9f (diff) |
buttons plugin : avoid multiple change event trigger (#31000)
- add unit test to count how many events are thrown when widget contains multiple tags inside label
- add a parameter to toggle, if click event is provided onto an input then don't trigger another change event already thrown by the browser
- simplify the case where toggle interface is called click provide from input itself OR it's a button without label. If label is present, then browser propagate click event from childrens through label and then cause multiple calls to toggle
- the test assumes that `.btn` class is always set onto the label if there's one, otherwise need to update this plugin and look for label around the input
Test with keyboard, mouse and js click call
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
-rw-r--r-- | .bundlewatch.config.json | 4 | ||||
-rw-r--r-- | js/src/button.js | 13 | ||||
-rw-r--r-- | js/tests/unit/button.js | 26 |
3 files changed, 37 insertions, 6 deletions
diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index e12dda9181..fb76d8dd83 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -26,7 +26,7 @@ }, { "path": "./dist/js/bootstrap.bundle.js", - "maxSize": "47.50 kB" + "maxSize": "47.5 kB" }, { "path": "./dist/js/bootstrap.bundle.min.js", @@ -34,7 +34,7 @@ }, { "path": "./dist/js/bootstrap.js", - "maxSize": "25 kB" + "maxSize": "25.5 kB" }, { "path": "./dist/js/bootstrap.min.js", diff --git a/js/src/button.js b/js/src/button.js index d793785829..c95013a98c 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -46,6 +46,7 @@ const EVENT_LOAD_DATA_API = `load${EVENT_KEY}${DATA_API_KEY}` class Button { constructor(element) { this._element = element + this.shouldAvoidTriggerChange = false } // Getters @@ -83,7 +84,9 @@ class Button { input.checked = !this._element.classList.contains(CLASS_NAME_ACTIVE) } - $(input).trigger('change') + if (!this.shouldAvoidTriggerChange) { + $(input).trigger('change') + } } input.focus() @@ -109,7 +112,7 @@ class Button { // Static - static _jQueryInterface(config) { + static _jQueryInterface(config, avoidTriggerChange) { return this.each(function () { const $element = $(this) let data = $element.data(DATA_KEY) @@ -119,6 +122,8 @@ class Button { $element.data(DATA_KEY, data) } + data.shouldAvoidTriggerChange = avoidTriggerChange + if (config === 'toggle') { data[config]() } @@ -151,8 +156,8 @@ $(document) return } - if (initialButton.tagName !== 'LABEL' || inputBtn && inputBtn.type !== 'checkbox') { - Button._jQueryInterface.call($(button), 'toggle') + if (initialButton.tagName === 'INPUT' || button.tagName !== 'LABEL') { + Button._jQueryInterface.call($(button), 'toggle', initialButton.tagName === 'INPUT') } } }) diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js index 2adffedd9f..1bd62b6b8b 100644 --- a/js/tests/unit/button.js +++ b/js/tests/unit/button.js @@ -180,6 +180,32 @@ $(function () { $group.find('label').trigger('click') }) + QUnit.test('should trigger label change event only once', function (assert) { + assert.expect(1) + var done = assert.async() + var countChangeEvent = 0 + + var groupHTML = '<div class="btn-group" data-toggle="buttons">' + + '<label class="btn btn-primary">' + + '<input type="checkbox"><span class="check">✓</span> <i class="far fa-clipboard"></i> <span class="d-none d-lg-inline">checkbox</span>' + + '</label>' + + '</div>' + var $group = $(groupHTML).appendTo('#qunit-fixture') + + var $btn = $group.children().eq(0) + + $group.find('label').on('change', function () { + countChangeEvent++ + }) + + setTimeout(function () { + assert.ok(countChangeEvent === 1, 'onchange event fired only once') + done() + }, 5) + + $btn[0].click() + }) + QUnit.test('should check for closest matching toggle', function (assert) { assert.expect(18) var groupHTML = '<div class="btn-group" data-toggle="buttons">' + |