From 215b7e08f89877002092a9f695e984b48d0754ee Mon Sep 17 00:00:00 2001 From: Steve Gill Date: Fri, 8 May 2015 15:33:05 -0700 Subject: [PATCH] Update JS snapshot to version 4.1.0-dev (via coho) --- bin/templates/project/assets/www/cordova.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js index ef3c26ef..01c1051b 100644 --- a/bin/templates/project/assets/www/cordova.js +++ b/bin/templates/project/assets/www/cordova.js @@ -1,5 +1,5 @@ // Platform: android -// b4af1c5ec477dd98cd651932ea6df6d46705d7f9 +// b0463746dd842818c1f08560e998ec847460596c /* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -101,12 +101,15 @@ if (typeof module === "object" && typeof require === "function") { // file: src/cordova.js define("cordova", function(require, exports, module) { -if ("cordova" in window) { throw new Error("cordova already defined"); }; +if(window.cordova){ + throw new Error("cordova already defined"); +} var channel = require('cordova/channel'); var platform = require('cordova/platform'); + /** * Intercept calls to addEventListener + removeEventListener and handle deviceready, * resume, and pause events. @@ -893,11 +896,7 @@ var cordova = require('cordova'), // For the ONLINE_EVENT to be viable, it would need to intercept all event // listeners (both through addEventListener and window.ononline) as well // as set the navigator property itself. - ONLINE_EVENT: 2, - // Uses reflection to access private APIs of the WebView that can send JS - // to be executed. - // Requires Android 3.2.4 or above. - PRIVATE_API: 3 + ONLINE_EVENT: 2 }, jsToNativeBridgeMode, // Set lazily. nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT,