Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clear timeout before showing the toast #31155

Merged
merged 5 commits into from Jul 11, 2020
Merged

Clear timeout before showing the toast #31155

merged 5 commits into from Jul 11, 2020

Conversation

rohit2sharma95
Copy link
Collaborator

Closes #28164

@rohit2sharma95 rohit2sharma95 requested a review from a team as a code owner June 23, 2020 18:09
@XhmikosR XhmikosR added this to Inbox in v4.5.1 via automation Jun 26, 2020
@XhmikosR XhmikosR added this to Inbox in v5.0.0-alpha2 via automation Jun 26, 2020
@XhmikosR XhmikosR requested a review from Johann-S July 3, 2020 06:08
Johann-S
Johann-S reviewed Jul 7, 2020
View reviewed changes
js/src/toast.js Outdated Show resolved Hide resolved
v5.0.0-alpha2 automation moved this from Inbox to Approved Jul 7, 2020
@mdo mdo merged commit f6348f6 into twbs:main Jul 11, 2020
v5.0.0-alpha2 automation moved this from Approved to Shipped Jul 11, 2020
@mdo mdo moved this from Inbox to Needs manual backport in v4.5.1 Jul 13, 2020
@XhmikosR
Copy link
Member

@rohit2sharma95 can you backport this to v4-dev please?

XhmikosR pushed a commit that referenced this pull request Jul 14, 2020
@rohit2sharma95 @XhmikosR
Clear timeout before showing the toast (#31155)
6fb5571 
* clear timeout before showing the toast

* Add unit test

* Remove the check for timeout

* Check for clearTimeout to have been called

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
# Conflicts:
#	js/tests/unit/toast.spec.js
@rohit2sharma95
Copy link
Collaborator Author

Okay, Sure @XhmikosR
Should I create a new PR against v4-dev branch?

@XhmikosR
Copy link
Member

Yes, please. Or just add the missing unit test in a PR against my v4-dev-xmr branch.

@XhmikosR XhmikosR moved this from Needs manual backport to Cherry picked/Manually backported in v4.5.1 Jul 15, 2020
XhmikosR pushed a commit that referenced this pull request Jul 15, 2020
@rohit2sharma95 @XhmikosR
Clear timeout before showing the toast (#31155)
2f5c910 
* clear timeout before showing the toast

* Add unit test

* Remove the check for timeout

* Check for clearTimeout to have been called

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
# Conflicts:
#	js/tests/unit/toast.spec.js
@rohit2sharma95 rohit2sharma95 deleted the toast-timeout branch July 17, 2020 13:53
XhmikosR pushed a commit that referenced this pull request Jul 29, 2020
@rohit2sharma95 @XhmikosR
Clear timeout before showing the toast (#31155)
de0e1b5 
* clear timeout before showing the toast

* Add unit test

* Remove the check for timeout

* Check for clearTimeout to have been called

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
# Conflicts:
#	js/tests/unit/toast.spec.js
XhmikosR pushed a commit that referenced this pull request Aug 3, 2020
@rohit2sharma95 @XhmikosR
Clear timeout before showing the toast (#31155)
2cbe9b1 
* clear timeout before showing the toast

* Add unit test

* Remove the check for timeout

* Check for clearTimeout to have been called

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
# Conflicts:
#	js/tests/unit/toast.spec.js
@XhmikosR XhmikosR moved this from Cherry picked/Manually backported to Shipped in v4.5.1 Aug 3, 2020
XhmikosR pushed a commit that referenced this pull request Aug 3, 2020
@rohit2sharma95 @XhmikosR
Clear timeout before showing the toast (#31155)
f530ab7 
* clear timeout before showing the toast

* Add unit test

* Remove the check for timeout

* Check for clearTimeout to have been called

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
# Conflicts:
#	js/tests/unit/toast.spec.js
dsynr added a commit to dsynr/bootstrap that referenced this pull request Aug 21, 2020
@dsynr @mdo
@XhmikosR @ysds @patrickhlauke @rohit2sharma95 @ffoodd @MartijnCuppens
V4 dev (#1)
f0bc90f 
* Remove backdrop-filter from toasts

* BrowserStack: test on Edge 15

* Backport twbs#31135

* Move color utility callouts to start of page

Hierarchically/structurally, in the position they are currently at, the two callouts seem like they "belong" just to the "background color" section. Moving them to the start makes it clearer that those two callouts relate to everything in the page (both "Color" and "Background color" classes.

* Change heading level

otherwise the assistive technology callout looks like it's hierarchically under the "Dealing with specificity" heading

* Backport twbs#30326

Prevent overflowing static backdrop modal animation

TODO: backport the test too

* Backport twbs#30326 (Unit test)

* Update Babel config (twbs#31011)

* remove plugin-proposal-object-rest-spread
* add bugfixes
* `exclude: ['transform-typeof-symbol']` did nothing with our config

* Update devDependencies and gems

* Update dependencies, gems and regenerate package-lock.json (twbs#31261)

* @rollup/plugin-node-resolve 8.1.0
* popper.js 1.16.1
* qunit 2.10.1
* rollup 2.21.0

* Docs: forms accessibility cleanup (backport from v5) (twbs#31234)

* Expand advice for anchor-based controls

* Expand accessibility note in input group

* Correct statement about validation, fix server example

* Tweak label > accessible name

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
Co-authored-by: Mark Otto <markd.otto@gmail.com>

* Turn off scroll anchoring for accordions (twbs#31347)

New default behavior for scroll anchoring (rolled out in Chrome 84?) leads to unsightly/odd accordion interactions - see twbs#31341
This rule suppresses this new behavior and reverts back to the old way.

See https://drafts.csswg.org/css-scroll-anchoring/

* Update to Ruby 2.7/Bundler 2.x. (twbs#31296)

* Clear timeout before showing the toast (twbs#31155)

* clear timeout before showing the toast

* Add unit test

* Remove the check for timeout

* Check for clearTimeout to have been called

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
# Conflicts:
#	js/tests/unit/toast.spec.js

* Add unit test for toast to check clearTimeout to have been called (twbs#31298)

* docs(skippy): prevent skip links from overlapping header

* Backport twbs#31344

Add toasts to the components requiring JavaScript

* Update devDependencies and gems

* @babel/cli                   ^7.10.4  →  ^7.11.0
* @babel/core                  ^7.10.4  →  ^7.11.0
* @rollup/plugin-babel          ^5.0.4  →   ^5.1.0
* @rollup/plugin-commonjs      ^13.0.0  →  ^14.0.0
* @rollup/plugin-node-resolve   ^8.1.0  →   ^8.4.0
* autoprefixer                  ^9.8.4  →   ^9.8.6
* eslint                        ^7.4.0  →   ^7.6.0
* karma                         ^5.1.0  →   ^5.1.1
* rollup                       ^2.21.0  →  ^2.23.0

* Remove overflow: hidden from toasts (twbs#31381) (twbs#31407)

Co-authored-by: Mark Otto <markd.otto@gmail.com>

* Backport twbs#31339 (twbs#31414)

* Backport twbs#31339

Add view on GitHub links for easier content editing from the docs

* Prepare v4.5.1. (twbs#31408)

* Remove flex: 1 0 100% from rows (twbs#31439) (twbs#31445)

Co-authored-by: XhmikosR <xhmikosr@gmail.com>

Co-authored-by: Mark Otto <markd.otto@gmail.com>

* Restore make-container-max-widths mixin

* Deprecate the `make-container-max-widths` mixin

* Remove undefined `$ignore-warning`

* Prepare v4.5.2. (twbs#31444)

Co-authored-by: Mark Otto <markd.otto@gmail.com>
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
Co-authored-by: ysds <ysds.code@gmail.com>
Co-authored-by: Patrick H. Lauke <redux@splintered.co.uk>
Co-authored-by: Rohit Sharma <rohit2sharma95@gmail.com>
Co-authored-by: Gaël Poupard <gael.poupard@orange.com>
Co-authored-by: Martijn Cuppens <martijn.cuppens@gmail.com>
olsza pushed a commit to olsza/bootstrap that referenced this pull request Oct 3, 2020
@rohit2sharma95 @XhmikosR @olsza
Clear timeout before showing the toast (twbs#31155)
14436f8 
* clear timeout before showing the toast

* Add unit test

* Remove the check for timeout

* Check for clearTimeout to have been called

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
@nelsonni nelsonni mentioned this pull request Jan 5, 2021
Merged
@RyanBerliner RyanBerliner mentioned this pull request May 12, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Johann-S Johann-S Johann-S approved these changes

Assignees
No one assigned
Labels
backport-to-v4 js v4 v5
Projects
No open projects
v4.5.1
  
Shipped
v5.0.0-alpha2
  
Shipped
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

bootstrap 4.2.1 toast delay does not 'restart' if the toast is shown again before the timeout ends
4 participants
@rohit2sharma95 @XhmikosR @Johann-S @mdo