Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EDAA02007D1 for ; Thu, 12 May 2016 14:06:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EAC16160939; Thu, 12 May 2016 12:06:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3D758160868 for ; Thu, 12 May 2016 14:06:13 +0200 (CEST) Received: (qmail 57255 invoked by uid 500); 12 May 2016 12:06:12 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 57245 invoked by uid 99); 12 May 2016 12:06:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 May 2016 12:06:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2579BDFC71; Thu, 12 May 2016 12:06:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: daserge@apache.org To: commits@cordova.apache.org Message-Id: <938d98b28c314299bbfeec10ddb69121@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cordova-windows git commit: CB-11156 Change default FadeSplashScreenDuration value Date: Thu, 12 May 2016 12:06:12 +0000 (UTC) archived-at: Thu, 12 May 2016 12:06:14 -0000 Repository: cordova-windows Updated Branches: refs/heads/master b8b636cd0 -> f4e20a3a1 CB-11156 Change default FadeSplashScreenDuration value Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/f4e20a3a Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/f4e20a3a Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/f4e20a3a Branch: refs/heads/master Commit: f4e20a3a10dcdc038abe3699d7a4f6576cc8eded Parents: b8b636c Author: daserge Authored: Tue Apr 26 19:14:34 2016 +0300 Committer: daserge Committed: Thu May 12 14:58:58 2016 +0300 ---------------------------------------------------------------------- cordova-js-src/splashscreen.js | 3 ++- template/www/cordova.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/f4e20a3a/cordova-js-src/splashscreen.js ---------------------------------------------------------------------- diff --git a/cordova-js-src/splashscreen.js b/cordova-js-src/splashscreen.js index fcdefdf..6288b62 100644 --- a/cordova-js-src/splashscreen.js +++ b/cordova-js-src/splashscreen.js @@ -31,6 +31,7 @@ var splashElement = null, extendedSplashImage = null, extendedSplashProgress = n //// var DEFAULT_SPLASHSCREEN_DURATION = 3000, // in milliseconds + DEFAULT_FADE_DURATION = 500, // in milliseconds FPS = 60, // frames per second used by requestAnimationFrame PROGRESSRING_HEIGHT = 40, PROGRESSRING_BOTTOM_MARGIN = 10; // needed for windows 10 min height window @@ -39,7 +40,7 @@ var bgColor = "#464646", autoHideSplashScreen = true, splashScreenDelay = DEFAULT_SPLASHSCREEN_DURATION, fadeSplashScreen = true, - fadeSplashScreenDuration = DEFAULT_SPLASHSCREEN_DURATION, + fadeSplashScreenDuration = DEFAULT_FADE_DURATION, showSplashScreenSpinner = true, splashScreenSpinnerColor; // defaults to system accent color http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/f4e20a3a/template/www/cordova.js ---------------------------------------------------------------------- diff --git a/template/www/cordova.js b/template/www/cordova.js index e4d64e1..4723aba 100644 --- a/template/www/cordova.js +++ b/template/www/cordova.js @@ -1811,6 +1811,7 @@ var splashElement = null, extendedSplashImage = null, extendedSplashProgress = n //// var DEFAULT_SPLASHSCREEN_DURATION = 3000, // in milliseconds + DEFAULT_FADE_DURATION = 500, // in milliseconds FPS = 60, // frames per second used by requestAnimationFrame PROGRESSRING_HEIGHT = 40, PROGRESSRING_BOTTOM_MARGIN = 10; // needed for windows 10 min height window @@ -1819,7 +1820,7 @@ var bgColor = "#464646", autoHideSplashScreen = true, splashScreenDelay = DEFAULT_SPLASHSCREEN_DURATION, fadeSplashScreen = true, - fadeSplashScreenDuration = DEFAULT_SPLASHSCREEN_DURATION, + fadeSplashScreenDuration = DEFAULT_FADE_DURATION, showSplashScreenSpinner = true, splashScreenSpinnerColor; // defaults to system accent color --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org