Skip to content

feat(browser): Use FadeSplashScreenDuration from config.xml on browser platform #151

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#If ignorance is bliss, then somebody knock the smile off my face

/.idea
*.csproj.user
*.suo
*.cache
Expand Down
12 changes: 8 additions & 4 deletions src/browser/SplashScreenProxy.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down