raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed exit transition bug

Browse Source
This commit is contained in:
Nico Opiyo 2019-03-07 23:20:57 +03:00
parent 93a6a6a75b
commit de1790ac76
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/display/html/display.js
View File

@ -454,9 +454,11 @@ var Display = {
alertBackground.addEventListener('animationend', function (e) { alertBackground.addEventListener('animationend', function (e) {
e.stopPropagation(); e.stopPropagation();
if (Display._animationState === AnimationState.ScrollingAnimation) { if (Display._animationState === AnimationState.ScrollingAnimation) {
console.debug("Scrolling animation finished");
alertText.classList.remove("horizontal-scroll-animation"); alertText.classList.remove("horizontal-scroll-animation");
alertText.style.visibility = "hidden"; alertText.style.visibility = "hidden";
Display._animationState = AnimationState.NoAnimation; Display._animationState = AnimationState.NoAnimation;
Display.doExitTransition();
} }
}); });
}, },
@ -486,7 +488,7 @@ var Display = {
alertBackground.style.backgroundColor = settings.background_color; alertBackground.style.backgroundColor = settings.background_color;
if (this._alertState === AlertState.DisplayingFromQueue) { if (this._alertState === AlertState.DisplayingFromQueue) {
transitionSetting = "1s linear 1s"; transitionSetting = "1s linear 2s";
} }
else { else {
transitionSetting = "1s linear"; transitionSetting = "1s linear";