From 413c874db3e419b7f8219901bd591c8c901d2696 Mon Sep 17 00:00:00 2001 From: Jesse MacFadyen Date: Mon, 4 May 2015 17:47:52 -0700 Subject: [PATCH 1/2] check the window.cordova object a little more strictly --- src/cordova.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cordova.js b/src/cordova.js index 1f1b92d45..ed1a58253 100644 --- a/src/cordova.js +++ b/src/cordova.js @@ -19,12 +19,16 @@ * */ -if ("cordova" in window) { throw new Error("cordova already defined"); }; + var channel = require('cordova/channel'); var platform = require('cordova/platform'); +if (window.cordova && window.cordova.platformId && window.cordova.platformId == platform.id){ + throw new Error("cordova already defined"); +}; + /** * Intercept calls to addEventListener + removeEventListener and handle deviceready, * resume, and pause events. From d810710c1ad3bf0937fc062c98a7312f383f116b Mon Sep 17 00:00:00 2001 From: Jesse MacFadyen Date: Mon, 4 May 2015 22:03:16 -0700 Subject: [PATCH 2/2] simplified cordova check, and it still works with ripple --- src/cordova.js | 7 +++---- src/cordova_b.js | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/cordova.js b/src/cordova.js index ed1a58253..1ef347887 100644 --- a/src/cordova.js +++ b/src/cordova.js @@ -19,15 +19,14 @@ * */ - +if(window.cordova){ + throw new Error("cordova already defined"); +}; var channel = require('cordova/channel'); var platform = require('cordova/platform'); -if (window.cordova && window.cordova.platformId && window.cordova.platformId == platform.id){ - throw new Error("cordova already defined"); -}; /** * Intercept calls to addEventListener + removeEventListener and handle deviceready, diff --git a/src/cordova_b.js b/src/cordova_b.js index 82facf564..d98502bb9 100644 --- a/src/cordova_b.js +++ b/src/cordova_b.js @@ -19,7 +19,9 @@ * */ -if ("cordova" in window) { throw new Error("cordova already defined"); }; +if(window.cordova){ + throw new Error("cordova already defined"); +}; /*global symbolList*/