CB-12193 cordova.js crashes windows app if there is no CoreWindow

Also made confighelper to load after WinJS as it depends on it
apache · Dec 9, 2016 · 707bf96 · 707bf96
1 parent 623ff18
commit 707bf96
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 14 deletions.
diff --git a/cordova-js-src/platform.js b/cordova-js-src/platform.js
@@ -27,7 +27,6 @@ module.exports = {
             channel = cordova.require('cordova/channel'),
             platform = require('cordova/platform'),
             modulemapper = require('cordova/modulemapper'),
-            configHelper = require('cordova/confighelper'),
             utils = require('cordova/utils');
 
         modulemapper.clobbers('cordova/exec/proxy', 'cordova.commandProxy');
@@ -41,7 +40,8 @@ module.exports = {
 
         var onWinJSReady = function () {
             var app = WinJS.Application,
-                splashscreen = require('cordova/splashscreen');
+                splashscreen = require('cordova/splashscreen'),
+                configHelper = require('cordova/confighelper');
 
             modulemapper.clobbers('cordova/splashscreen', 'navigator.splashscreen');
 
@@ -94,13 +94,22 @@ module.exports = {
                 }));
             };
 
-            app.addEventListener("checkpoint", checkpointHandler);
-            app.addEventListener("activated", activationHandler, false);
-            Windows.UI.WebUI.WebUIApplication.addEventListener("resuming", resumingHandler, false);
+            // CB-12193 CoreWindow and some WinRT APIs are not available in webview
+            var isCoreWindowAvailable = false;
+            try {
+                Windows.UI.ViewManagement.ApplicationView.getForCurrentView();
+                isCoreWindowAvailable = true;
+            } catch (e) { }
+
+            if (isCoreWindowAvailable) {
+                app.addEventListener("checkpoint", checkpointHandler);
+                app.addEventListener("activated", activationHandler, false);
+                Windows.UI.WebUI.WebUIApplication.addEventListener("resuming", resumingHandler, false);
 
-            injectBackButtonHandler();
+                injectBackButtonHandler();
 
-            app.start();
+                app.start();
+            }
         };
 
         function appendScript(scriptElem, loadedCb) {

diff --git a/template/www/cordova.js b/template/www/cordova.js
@@ -1558,7 +1558,6 @@ module.exports = {
             channel = cordova.require('cordova/channel'),
             platform = require('cordova/platform'),
             modulemapper = require('cordova/modulemapper'),
-            configHelper = require('cordova/confighelper'),
             utils = require('cordova/utils');
 
         modulemapper.clobbers('cordova/exec/proxy', 'cordova.commandProxy');
@@ -1572,7 +1571,8 @@ module.exports = {
 
         var onWinJSReady = function () {
             var app = WinJS.Application,
-                splashscreen = require('cordova/splashscreen');
+                splashscreen = require('cordova/splashscreen'),
+                configHelper = require('cordova/confighelper');
 
             modulemapper.clobbers('cordova/splashscreen', 'navigator.splashscreen');
 
@@ -1625,13 +1625,22 @@ module.exports = {
                 }));
             };
 
-            app.addEventListener("checkpoint", checkpointHandler);
-            app.addEventListener("activated", activationHandler, false);
-            Windows.UI.WebUI.WebUIApplication.addEventListener("resuming", resumingHandler, false);
+            // CB-12193 CoreWindow and some WinRT APIs are not available in webview
+            var isCoreWindowAvailable = false;
+            try {
+                Windows.UI.ViewManagement.ApplicationView.getForCurrentView();
+                isCoreWindowAvailable = true;
+            } catch (e) { }
+
+            if (isCoreWindowAvailable) {
+                app.addEventListener("checkpoint", checkpointHandler);
+                app.addEventListener("activated", activationHandler, false);
+                Windows.UI.WebUI.WebUIApplication.addEventListener("resuming", resumingHandler, false);
 
-            injectBackButtonHandler();
+                injectBackButtonHandler();
 
-            app.start();
+                app.start();
+            }
         };
 
         function appendScript(scriptElem, loadedCb) {