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.

Sign up for GitHub

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

ENYO-5623: Fix ui/Marquee to stop when blurred during restart timer #1935

Merged
merged 2 commits into from
Sep 7, 2018
Merged

ENYO-5623: Fix ui/Marquee to stop when blurred during restart timer #1935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7151086
fix synchronized marquees to stop when blurred during restart timer
Sep 7, 2018
02a8c1f
change log
Sep 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/ui/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

The following is a curated list of changes in the Enact ui module, newest changes on the top.

## [unreleased]

### Fixed

- `ui/Marquee` to stop when blurred during restart timer

## [2.1.2] - 2018-09-04

### Fixed
Expand Down
1 change: 0 additions & 1 deletion packages/ui/Marquee/MarqueeController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ const MarqueeController = hoc(defaultConfig, (config, Wrapped) => {
handleComplete = (component) => {
const complete = this.markReady(component);
if (complete) {
this.cancelJob.stop();
Copy link
Contributor

@webOS101 webOS101 Sep 7, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this is safe enough. I think the thought process was that any time we were going to issue a start, we should prevent cancel from stopping it. But, I think in this instance, it makes sense that if we have a cancel pending, we would want to allow it to prevent the restart. In theory, you could check to see if the cancel was pending and not issue the restart.

this.markAll(STATE.ready);
this.dispatch('start');
}
Expand Down