cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject android commit: Update JS snapshot to version 4.1.0-dev (via coho)
Date Fri, 08 May 2015 23:43:03 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/master 754911f34 -> 215b7e08f


Update JS snapshot to version 4.1.0-dev (via coho)


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/215b7e08
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/215b7e08
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/215b7e08

Branch: refs/heads/master
Commit: 215b7e08f89877002092a9f695e984b48d0754ee
Parents: 754911f
Author: Steve Gill <stevengill97@gmail.com>
Authored: Fri May 8 15:33:05 2015 -0700
Committer: Steve Gill <stevengill97@gmail.com>
Committed: Fri May 8 15:33:05 2015 -0700

----------------------------------------------------------------------
 bin/templates/project/assets/www/cordova.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/215b7e08/bin/templates/project/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js
index ef3c26e..01c1051 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,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message