From a18cc8241ae040ef622e0732b91e44fda072efab Mon Sep 17 00:00:00 2001 From: "Peter (Somogyvari) Metz" Date: Sun, 26 Jun 2016 21:10:50 +0100 Subject: [PATCH] CB-11488 (browser) The hide() call became non re-entrant after the addition of fade out. This fixes the issue. --- src/browser/SplashScreenProxy.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/browser/SplashScreenProxy.js b/src/browser/SplashScreenProxy.js index cd3b7fd..83c37d5 100644 --- a/src/browser/SplashScreenProxy.js +++ b/src/browser/SplashScreenProxy.js @@ -81,17 +81,19 @@ var SplashScreen = { }, hide: function () { if(localSplash) { + var innerLocalSplash = localSplash; + localSplash = null; window.removeEventListener("resize", onResize, false); - localSplash.style.opacity = '0'; - localSplash.style["-webkit-transition"] = "opacity 1s ease-in-out"; - localSplash.style["-moz-transition"] = "opacity 1s ease-in-out"; - localSplash.style["-ms-transition"] = "opacity 1s ease-in-out"; - localSplash.style["-o-transition"] = "opacity 1s ease-in-out"; + innerLocalSplash.style.opacity = '0'; + innerLocalSplash.style["-webkit-transition"] = "opacity 1s ease-in-out"; + innerLocalSplash.style["-moz-transition"] = "opacity 1s ease-in-out"; + innerLocalSplash.style["-ms-transition"] = "opacity 1s ease-in-out"; + innerLocalSplash.style["-o-transition"] = "opacity 1s ease-in-out"; window.setTimeout(function () { - document.body.removeChild(localSplash); - localSplash = null; + document.body.removeChild(innerLocalSplash); + innerLocalSplash = null; }, 1000);