You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2016/07/02 05:25:59 UTC
cordova-windows git commit: CB-11470 App crashes when trying to open
from another app using Custom URL (Protocol)
Repository: cordova-windows
Updated Branches:
refs/heads/master 04a0099dd -> 37f6494be
CB-11470 App crashes when trying to open from another app using Custom URL (Protocol)
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/37f6494b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/37f6494b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/37f6494b
Branch: refs/heads/master
Commit: 37f6494beef23b88bcf91420aff7e8e7c39a328f
Parents: 04a0099
Author: daserge <v-...@microsoft.com>
Authored: Thu Jun 30 19:32:37 2016 +0300
Committer: daserge <v-...@microsoft.com>
Committed: Thu Jun 30 19:32:37 2016 +0300
----------------------------------------------------------------------
cordova-js-src/splashscreen.js | 20 +++++++++-----------
template/www/cordova.js | 20 +++++++++-----------
2 files changed, 18 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/37f6494b/cordova-js-src/splashscreen.js
----------------------------------------------------------------------
diff --git a/cordova-js-src/splashscreen.js b/cordova-js-src/splashscreen.js
index 6288b62..0d1be69 100644
--- a/cordova-js-src/splashscreen.js
+++ b/cordova-js-src/splashscreen.js
@@ -286,20 +286,18 @@ var splash = null; // Variable to hold the splash screen object.
var coordinates = { x: 0, y: 0, width: 0, height: 0 }; // Object to store splash screen image coordinates. It will be initialized during activation.
function activated(eventObject) {
- if (eventObject.detail.kind === Windows.ApplicationModel.Activation.ActivationKind.launch) {
- // Retrieve splash screen object
- splash = eventObject.detail.splashScreen;
+ // Retrieve splash screen object
+ splash = eventObject.detail.splashScreen;
- // Retrieve the window coordinates of the splash screen image.
- coordinates = splash.imageLocation;
+ // Retrieve the window coordinates of the splash screen image.
+ coordinates = splash.imageLocation;
- // Register an event handler to be executed when the splash screen has been dismissed.
- splash.addEventListener('dismissed', onSplashScreenDismissed, false);
+ // Register an event handler to be executed when the splash screen has been dismissed.
+ splash.addEventListener('dismissed', onSplashScreenDismissed, false);
- // Listen for window resize events to reposition the extended splash screen image accordingly.
- // This is important to ensure that the extended splash screen is formatted properly in response to snapping, unsnapping, rotation, etc...
- window.addEventListener('resize', onResize, false);
- }
+ // Listen for window resize events to reposition the extended splash screen image accordingly.
+ // This is important to ensure that the extended splash screen is formatted properly in response to snapping, unsnapping, rotation, etc...
+ window.addEventListener('resize', onResize, false);
}
function onSplashScreenDismissed() {
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/37f6494b/template/www/cordova.js
----------------------------------------------------------------------
diff --git a/template/www/cordova.js b/template/www/cordova.js
index 7500c6a..ff2c7f2 100644
--- a/template/www/cordova.js
+++ b/template/www/cordova.js
@@ -2070,20 +2070,18 @@ var splash = null; // Variable to hold the splash screen object.
var coordinates = { x: 0, y: 0, width: 0, height: 0 }; // Object to store splash screen image coordinates. It will be initialized during activation.
function activated(eventObject) {
- if (eventObject.detail.kind === Windows.ApplicationModel.Activation.ActivationKind.launch) {
- // Retrieve splash screen object
- splash = eventObject.detail.splashScreen;
+ // Retrieve splash screen object
+ splash = eventObject.detail.splashScreen;
- // Retrieve the window coordinates of the splash screen image.
- coordinates = splash.imageLocation;
+ // Retrieve the window coordinates of the splash screen image.
+ coordinates = splash.imageLocation;
- // Register an event handler to be executed when the splash screen has been dismissed.
- splash.addEventListener('dismissed', onSplashScreenDismissed, false);
+ // Register an event handler to be executed when the splash screen has been dismissed.
+ splash.addEventListener('dismissed', onSplashScreenDismissed, false);
- // Listen for window resize events to reposition the extended splash screen image accordingly.
- // This is important to ensure that the extended splash screen is formatted properly in response to snapping, unsnapping, rotation, etc...
- window.addEventListener('resize', onResize, false);
- }
+ // Listen for window resize events to reposition the extended splash screen image accordingly.
+ // This is important to ensure that the extended splash screen is formatted properly in response to snapping, unsnapping, rotation, etc...
+ window.addEventListener('resize', onResize, false);
}
function onSplashScreenDismissed() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org