From 728e404cdc3054f68c4da19bd1de928002cc3bfe Mon Sep 17 00:00:00 2001 From: royalrex Date: Mon, 14 May 2018 15:17:34 +0200 Subject: [PATCH 1/3] Use FadeSplashScreenDuration from config.xml on browser platform --- src/browser/SplashScreenProxy.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/browser/SplashScreenProxy.js b/src/browser/SplashScreenProxy.js index 1a5cd30f..ad950a81 100644 --- a/src/browser/SplashScreenProxy.js +++ b/src/browser/SplashScreenProxy.js @@ -28,6 +28,7 @@ var localSplashImage; var bgColor = "#464646"; var imageSrc = '/img/logo.png'; var splashScreenDelay = 3000; // in milliseconds +var fadeSplashScreenDuration = 500; // in milliseconds var showSplashScreen = true; // show splashcreen by default var cordova = require('cordova'); var configHelper = cordova.require('cordova/confighelper'); @@ -93,11 +94,13 @@ var SplashScreen = { localSplash = null; window.removeEventListener("resize", onResize, false); + var transitionCssString = "opacity " + fadeSplashScreenDuration + "ms 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"; + innerLocalSplash.style["-webkit-transition"] = + innerLocalSplash.style["-moz-transition"] = + innerLocalSplash.style["-ms-transition"] = + innerLocalSplash.style["-o-transition"] = transitionCssString; window.setTimeout(function () { document.body.removeChild(innerLocalSplash); @@ -126,6 +129,7 @@ function readPreferencesFromCfg(cfg) { bgColor = cfg.getPreferenceValue('SplashScreenBackgroundColor') || bgColor; splashImageWidth = cfg.getPreferenceValue('SplashScreenWidth') || splashImageWidth; splashImageHeight = cfg.getPreferenceValue('SplashScreenHeight') || splashImageHeight; + fadeSplashScreenDuration = cfg.getPreferenceValue('FadeSplashScreenDuration') || fadeSplashScreenDuration; autoHideSplashScreen = cfg.getPreferenceValue('AutoHideSplashScreen') || autoHideSplashScreen; autoHideSplashScreen = (autoHideSplashScreen === true || autoHideSplashScreen.toLowerCase() === 'true'); } catch(e) { From c00cd6ad866816a1f8b4ea5c3ec60e288635ae80 Mon Sep 17 00:00:00 2001 From: Sebbe Selvig Date: Mon, 21 Nov 2022 09:14:17 +0100 Subject: [PATCH 2/3] Synced with remote --- src/browser/SplashScreenProxy.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/browser/SplashScreenProxy.js b/src/browser/SplashScreenProxy.js index ec495ed2..cf9276ec 100644 --- a/src/browser/SplashScreenProxy.js +++ b/src/browser/SplashScreenProxy.js @@ -94,13 +94,13 @@ var SplashScreen = { localSplash = null; window.removeEventListener('resize', onResize, false); - var transitionCssString = "opacity " + fadeSplashScreenDuration + "ms ease-in-out"; + var transitionCssString = `opacity ${fadeSplashScreenDuration}ms ease-in-out`; innerLocalSplash.style.opacity = '0'; - innerLocalSplash.style["-webkit-transition"] = - innerLocalSplash.style["-moz-transition"] = - innerLocalSplash.style["-ms-transition"] = - innerLocalSplash.style["-o-transition"] = transitionCssString; + innerLocalSplash.style['-webkit-transition'] = + innerLocalSplash.style['-moz-transition'] = + innerLocalSplash.style['-ms-transition'] = + innerLocalSplash.style['-o-transition'] = transitionCssString; window.setTimeout(function () { document.body.removeChild(innerLocalSplash); From 996bad60c2c0f66ed6daa03b71fedb69157b9108 Mon Sep 17 00:00:00 2001 From: Sebbe Selvig Date: Mon, 21 Nov 2022 09:14:28 +0100 Subject: [PATCH 3/3] Add .idea to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5099a0b6..8491a6d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ #If ignorance is bliss, then somebody knock the smile off my face +/.idea *.csproj.user *.suo *.cache