mirror of
https://github.com/apache/cordova-android.git
synced 2025-03-16 16:51:02 +08:00
Update cordova.js from cordova-js@4.2.3
using coho copy-js with the following change from cordova-js-src: * Remove obsolete check for JellyBean to work properly on Android Pie (GH-534)
This commit is contained in:
parent
7eed65e9b4
commit
cf5a02ea0f
25
bin/templates/project/assets/www/cordova.js
vendored
25
bin/templates/project/assets/www/cordova.js
vendored
@ -1,5 +1,5 @@
|
|||||||
// Platform: android
|
// Platform: android
|
||||||
// 4450a4cea50616e080a82e8ede9e3d6a1fe3c3ec
|
// 61a51908ef1d6e96a92e9e65e3c7166a39192f29
|
||||||
/*
|
/*
|
||||||
Licensed to the Apache Software Foundation (ASF) under one
|
Licensed to the Apache Software Foundation (ASF) under one
|
||||||
or more contributor license agreements. See the NOTICE file
|
or more contributor license agreements. See the NOTICE file
|
||||||
@ -22,6 +22,8 @@
|
|||||||
var PLATFORM_VERSION_BUILD_LABEL = '7.2.0-dev';
|
var PLATFORM_VERSION_BUILD_LABEL = '7.2.0-dev';
|
||||||
// file: src/scripts/require.js
|
// file: src/scripts/require.js
|
||||||
|
|
||||||
|
/* jshint -W079 */
|
||||||
|
/* jshint -W020 */
|
||||||
|
|
||||||
var require;
|
var require;
|
||||||
var define;
|
var define;
|
||||||
@ -324,7 +326,7 @@ module.exports = cordova;
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
|
// file: /Users/brodybits/Documents/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
|
||||||
define("cordova/android/nativeapiprovider", function(require, exports, module) {
|
define("cordova/android/nativeapiprovider", function(require, exports, module) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -347,7 +349,7 @@ module.exports = {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
|
// file: /Users/brodybits/Documents/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
|
||||||
define("cordova/android/promptbasednativeapi", function(require, exports, module) {
|
define("cordova/android/promptbasednativeapi", function(require, exports, module) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -879,7 +881,7 @@ module.exports = channel;
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/exec.js
|
// file: /Users/brodybits/Documents/cordova/cordova-android/cordova-js-src/exec.js
|
||||||
define("cordova/exec", function(require, exports, module) {
|
define("cordova/exec", function(require, exports, module) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -972,17 +974,6 @@ function androidExec(success, fail, service, action, args) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
androidExec.init = function() {
|
androidExec.init = function() {
|
||||||
//CB-11828
|
|
||||||
//This failsafe checks the version of Android and if it's Jellybean, it switches it to
|
|
||||||
//using the Online Event bridge for communicating from Native to JS
|
|
||||||
//
|
|
||||||
//It's ugly, but it's necessary.
|
|
||||||
var check = navigator.userAgent.toLowerCase().match(/android\s[0-9].[0-9]/);
|
|
||||||
var version_code = check && check[0].match(/4.[0-3].*/);
|
|
||||||
if (version_code != null && nativeToJsBridgeMode == nativeToJsModes.EVAL_BRIDGE) {
|
|
||||||
nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT;
|
|
||||||
}
|
|
||||||
|
|
||||||
bridgeSecret = +prompt('', 'gap_init:' + nativeToJsBridgeMode);
|
bridgeSecret = +prompt('', 'gap_init:' + nativeToJsBridgeMode);
|
||||||
channel.onNativeReady.fire();
|
channel.onNativeReady.fire();
|
||||||
};
|
};
|
||||||
@ -1637,7 +1628,7 @@ exports.reset();
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/platform.js
|
// file: /Users/brodybits/Documents/cordova/cordova-android/cordova-js-src/platform.js
|
||||||
define("cordova/platform", function(require, exports, module) {
|
define("cordova/platform", function(require, exports, module) {
|
||||||
|
|
||||||
// The last resume event that was received that had the result of a plugin call.
|
// The last resume event that was received that had the result of a plugin call.
|
||||||
@ -1747,7 +1738,7 @@ function onMessageFromNative(msg) {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/plugin/android/app.js
|
// file: /Users/brodybits/Documents/cordova/cordova-android/cordova-js-src/plugin/android/app.js
|
||||||
define("cordova/plugin/android/app", function(require, exports, module) {
|
define("cordova/plugin/android/app", function(require, exports, module) {
|
||||||
|
|
||||||
var exec = require('cordova/exec');
|
var exec = require('cordova/exec');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user