Merge pull request #34 from manifoldjs/v0.1.3

V0.1.3
pwa-builder · Jul 24, 2015 · 9f8565b · 9f8565b
2 parents 8e5b457 + 1f05fb6
commit 9f8565b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 20 deletions.
diff --git a/assets/windows/wrapper.css b/assets/windows/wrapper.css
diff --git a/assets/windows/wrapper.html b/assets/windows/wrapper.html
@@ -1,4 +1,4 @@
-<html>
+<html>
     <head>
         <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *">
         <meta name="format-detection" content="telephone=no">

diff --git a/assets/windows/wrapper.js b/assets/windows/wrapper.js
@@ -1,24 +1,28 @@
-var setupExtendedSplashScreen, updateSplashScreenPositioning,
+var setupExtendedSplashScreen, updateSplashScreenPositioning,
     splashScreen, splashScreenEl, splashScreenImageEl,
-    isWindows = navigator.appVersion.indexOf("Windows Phone 8.1") === -1;
+    isWindows = navigator.appVersion.indexOf("Windows Phone") === -1,
+    isWindowsPhone10 = navigator.appVersion.indexOf("Windows Phone 10") !== -1;
 
-WinJS.Application.addEventListener("activated", function (e) {
-    if (e.detail.kind === Windows.ApplicationModel.Activation.ActivationKind.launch) {
-        splashScreen = e.detail.splashScreen;
+// TODO: Need to fix styling issues whith the extended splash screen for Windows Phone 10 (disabled for now)
+if (!isWindowsPhone10) {
+    WinJS.Application.addEventListener("activated", function (e) {
+        if (e.detail.kind === Windows.ApplicationModel.Activation.ActivationKind.launch) {
+            splashScreen = e.detail.splashScreen;
 
-        // 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", updateSplashPositioning, 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", updateSplashPositioning, false);
 
-        var previousExecutionState = e.detail.previousExecutionState;
-        var state = Windows.ApplicationModel.Activation.ApplicationExecutionState;
-        if (previousExecutionState === state.notRunning
-            || previousExecutionState === state.terminated
-            || previousExecutionState === state.closedByUser) {
-            setupExtendedSplashScreen();
+            var previousExecutionState = e.detail.previousExecutionState;
+            var state = Windows.ApplicationModel.Activation.ApplicationExecutionState;
+            if (previousExecutionState === state.notRunning
+                || previousExecutionState === state.terminated
+                || previousExecutionState === state.closedByUser) {
+                setupExtendedSplashScreen();
+            }
         }
-    }
-}, false);
+    }, false);
+}
 
 setupExtendedSplashScreen = function () {
     splashScreenEl = document.getElementById("extendedSplashScreen");

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-hostedwebapp",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Hosted Web App Plugin",
   "cordova": {
     "id": "cordova-plugin-hostedwebapp",

diff --git a/plugin.xml b/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     id="cordova-plugin-hostedwebapp"
-    version="0.1.2">
+    version="0.1.3">
     <name>HostedWebApp</name>
     <description>Hosted Web App Plugin</description>
     <license>MIT License</license>