diff options
| author | Mark Otto <[email protected]> | 2021-09-13 22:20:49 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-09-13 22:20:49 -0600 |
| commit | 30bddc702f36a7a1b04771546f71033044d65b7a (patch) | |
| tree | 710fd90333caba16634162125155fee7c7c8b93d /js | |
| parent | 8dbe58a54a117a9ad86b7d98ac9a2d3fb2851b3f (diff) | |
| parent | 55a352d02304cb0012194c33b8b50f9426b53f94 (diff) | |
| download | bootstrap-css-vars-btn.tar.xz bootstrap-css-vars-btn.zip | |
Merge branch 'main' into css-vars-btncss-vars-btn
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/offcanvas.js | 2 | ||||
| -rw-r--r-- | js/src/util/backdrop.js | 2 | ||||
| -rw-r--r-- | js/src/util/focustrap.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/collapse.spec.js | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/js/src/offcanvas.js b/js/src/offcanvas.js index 57bf2e897..ba809cdf2 100644 --- a/js/src/offcanvas.js +++ b/js/src/offcanvas.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.1.1): offcanvas.js - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) * -------------------------------------------------------------------------- */ diff --git a/js/src/util/backdrop.js b/js/src/util/backdrop.js index e98d80707..80628c38d 100644 --- a/js/src/util/backdrop.js +++ b/js/src/util/backdrop.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.1.1): util/backdrop.js - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) * -------------------------------------------------------------------------- */ diff --git a/js/src/util/focustrap.js b/js/src/util/focustrap.js index ca6f8273f..f1433c219 100644 --- a/js/src/util/focustrap.js +++ b/js/src/util/focustrap.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.1.1): util/focustrap.js - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) * -------------------------------------------------------------------------- */ diff --git a/js/tests/unit/collapse.spec.js b/js/tests/unit/collapse.spec.js index ece88eff5..e37e37e55 100644 --- a/js/tests/unit/collapse.spec.js +++ b/js/tests/unit/collapse.spec.js @@ -2,7 +2,7 @@ import Collapse from '../../src/collapse' import EventHandler from '../../src/dom/event-handler' /** Test helpers */ -import { getFixture, clearFixture, jQueryMock } from '../helpers/fixture' +import { clearFixture, getFixture, jQueryMock } from '../helpers/fixture' describe('Collapse', () => { let fixtureEl @@ -294,14 +294,13 @@ describe('Collapse', () => { ' </div>' ].join('') - // const btn = fixtureEl.querySelector('[data-bs-target="#collapseOne"]') const el = fixtureEl.querySelector('#collapseOne') const activeTabPane = fixtureEl.querySelector('#nav-home') const collapse = new Collapse(el) let times = 1 el.addEventListener('hidden.bs.collapse', () => { - setTimeout(() => collapse.show(), 10) + collapse.show() }) el.addEventListener('shown.bs.collapse', () => { |