You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2017/11/06 23:28:06 UTC
[cordova-android] branch master updated (a1195ce -> 83601dc)
This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git.
from a1195ce Merge pull request #415 from infil00p/CB-13530
new b138867 CB-13528 Updated RELEASENOTES and Version for release 6.4.0
new 05aeaf1 Set VERSION to 6.5.0-dev (via coho)
new 83601dc Update JS snapshot to version 6.5.0-dev (via coho)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASENOTES.md | 11 +
VERSION | 2 +-
bin/templates/cordova/version | 2 +-
bin/templates/project/assets/www/cordova.js | 667 ++++++++++-----------
framework/build.gradle | 6 +-
.../src/org/apache/cordova/CordovaWebView.java | 2 +-
package.json | 2 +-
7 files changed, 341 insertions(+), 351 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@cordova.apache.org" <co...@cordova.apache.org>'].
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 02/03: Set VERSION to 6.5.0-dev (via coho)
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 05aeaf1bd2f7e207896be906eef08a029ae3bbe0
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Mon Nov 6 11:44:20 2017 -0800
Set VERSION to 6.5.0-dev (via coho)
---
VERSION | 2 +-
bin/templates/cordova/version | 2 +-
framework/build.gradle | 6 +++---
framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
package.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/VERSION b/VERSION
index 26c70f2..1c12120 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.4.0-dev
+6.5.0-dev
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 3b4df99..cf4c590 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,7 +20,7 @@
*/
// Coho updates this line:
-var VERSION = "6.4.0-dev";
+var VERSION = "6.5.0-dev";
module.exports.version = VERSION;
diff --git a/framework/build.gradle b/framework/build.gradle
index 6471c2d..31c53af 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -42,7 +42,7 @@ apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
group = 'org.apache.cordova'
-version = '6.4.0-dev'
+version = '6.5.0-dev'
android {
compileSdkVersion cdvCompileSdkVersion
@@ -129,9 +129,9 @@ bintray {
licenses = ['Apache-2.0']
labels = ['android', 'cordova', 'phonegap']
version {
- name = '6.4.0-dev'
+ name = '6.5.0-dev'
released = new Date()
- vcsTag = '6.4.0-dev'
+ vcsTag = '6.5.0-dev'
}
}
}
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 2f79224..6b34ff5 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -31,7 +31,7 @@ import android.webkit.WebChromeClient.CustomViewCallback;
* are not expected to implement it.
*/
public interface CordovaWebView {
- public static final String CORDOVA_VERSION = "6.4.0-dev";
+ public static final String CORDOVA_VERSION = "6.5.0-dev";
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
diff --git a/package.json b/package.json
index 39c6221..23c68e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-android",
- "version": "6.4.0",
+ "version": "6.5.0-dev",
"description": "cordova-android release",
"bin": {
"create": "bin/create"
--
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 01/03: CB-13528 Updated RELEASENOTES and Version
for release 6.4.0
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit b138867b78c9e09db2ad842fd969325276d85506
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Mon Nov 6 11:43:47 2017 -0800
CB-13528 Updated RELEASENOTES and Version for release 6.4.0
---
RELEASENOTES.md | 11 +++++++++++
package.json | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5707ac3..2792482 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,17 @@
-->
## Release Notes for Cordova (Android) ##
+### 6.4.0 (Nov 06, 2017)
+* [CB-13289](https://issues.apache.org/jira/browse/CB-13289) Fixing build problems with Studio Three, but keeping **Windows** Gradle fix for now, will be deprecated
+* [CB-13289](https://issues.apache.org/jira/browse/CB-13289) Fix test to work with new Google **Android** Gradle DSL
+* :CB-13501 : update appveyor node versions to support node 8
+* [CB-13499](https://issues.apache.org/jira/browse/CB-13499) Remove duplicate "setting" in error strings
+* Include missing values for task.name when 'cdvBuildMultipleApks' option is true, 'task.name' can have 'validateSigningArmv7Release' or 'validateSigningX86Release' values too.
+* [CB-13406](https://issues.apache.org/jira/browse/CB-13406) Fixed AVD API level comparison when choosing sub-par API level match. Added tests for the best_image method.
+* [CB-13404](https://issues.apache.org/jira/browse/CB-13404) add **Android**-versions to bundledDependencies. Ignore best emulator selection when parsed AVD information does not include API level in the target
+* [CB-12895](https://issues.apache.org/jira/browse/CB-12895) : eslint ignoring cordova.js
+* [CB-12895](https://issues.apache.org/jira/browse/CB-12895) Temporarily disabling eslint since cordova-js does not have eslint yet.
+
### 6.3.0 (Sep 25, 2017)
* [CB-6936](https://issues.apache.org/jira/browse/CB-6936) fix crash when calling methods on a destroyed webview
* [CB-12981](https://issues.apache.org/jira/browse/CB-12981) handle SDK 26.0.2 slightly different AVD list output for **Android** 8+ AVDs. Would cause "cannot read property replace of undefined" errors when trying to deploy an **Android** 8 emulator.
diff --git a/package.json b/package.json
index 88a0da7..39c6221 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-android",
- "version": "6.4.0-dev",
+ "version": "6.4.0",
"description": "cordova-android release",
"bin": {
"create": "bin/create"
--
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-android] 03/03: Update JS snapshot to version 6.5.0-dev
(via coho)
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
commit 83601dca2fa468a76bcb2c687b5baebfcb69588b
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Mon Nov 6 11:44:23 2017 -0800
Update JS snapshot to version 6.5.0-dev (via coho)
---
bin/templates/project/assets/www/cordova.js | 667 ++++++++++++++--------------
1 file changed, 323 insertions(+), 344 deletions(-)
diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js
index f71ab4d..5eb7b4d 100644
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -1,6 +1,5 @@
-/* eslint-disable */
// Platform: android
-// 74a4adc2d0fddb1e0cfb9be1961494ef0afc9893
+// 4450a4cea50616e080a82e8ede9e3d6a1fe3c3ec
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -20,35 +19,33 @@
under the License.
*/
;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '6.4.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '6.5.0-dev';
// file: src/scripts/require.js
-/*jshint -W079 */
-/*jshint -W020 */
+/* jshint -W079 */
+/* jshint -W020 */
-var require,
- define;
+var require;
+var define;
(function () {
- var modules = {},
+ var modules = {};
// Stack of moduleIds currently being built.
- requireStack = [],
+ var requireStack = [];
// Map of module ID -> index into requireStack of modules currently being built.
- inProgressModules = {},
- SEPARATOR = ".";
-
-
-
- function build(module) {
- var factory = module.factory,
- localRequire = function (id) {
- var resultantId = id;
- //Its a relative path, so lop off the last portion and add the id (minus "./")
- if (id.charAt(0) === ".") {
- resultantId = module.id.slice(0, module.id.lastIndexOf(SEPARATOR)) + SEPARATOR + id.slice(2);
- }
- return require(resultantId);
- };
+ var inProgressModules = {};
+ var SEPARATOR = '.';
+
+ function build (module) {
+ var factory = module.factory;
+ var localRequire = function (id) {
+ var resultantId = id;
+ // Its a relative path, so lop off the last portion and add the id (minus "./")
+ if (id.charAt(0) === '.') {
+ resultantId = module.id.slice(0, module.id.lastIndexOf(SEPARATOR)) + SEPARATOR + id.slice(2);
+ }
+ return require(resultantId);
+ };
module.exports = {};
delete module.factory;
factory(localRequire, module.exports, module);
@@ -57,10 +54,10 @@ var require,
require = function (id) {
if (!modules[id]) {
- throw "module " + id + " not found";
+ throw 'module ' + id + ' not found';
} else if (id in inProgressModules) {
var cycle = requireStack.slice(inProgressModules[id]).join('->') + '->' + id;
- throw "Cycle in require graph: " + cycle;
+ throw 'Cycle in require graph: ' + cycle;
}
if (modules[id].factory) {
try {
@@ -77,7 +74,7 @@ var require,
define = function (id, factory) {
if (modules[id]) {
- throw "module " + id + " already defined";
+ throw 'module ' + id + ' already defined';
}
modules[id] = {
@@ -93,8 +90,8 @@ var require,
define.moduleMap = modules;
})();
-//Export for use in node
-if (typeof module === "object" && typeof require === "function") {
+// Export for use in node
+if (typeof module === 'object' && typeof require === 'function') {
module.exports.require = require;
module.exports.define = define;
}
@@ -104,15 +101,13 @@ define("cordova", function(require, exports, module) {
// Workaround for Windows 10 in hosted environment case
// http://www.w3.org/html/wg/drafts/html/master/browsers.html#named-access-on-the-window-object
-if (window.cordova && !(window.cordova instanceof HTMLElement)) {
- throw new Error("cordova already defined");
+if (window.cordova && !(window.cordova instanceof HTMLElement)) { // eslint-disable-line no-undef
+ 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.
@@ -125,48 +120,48 @@ var m_window_removeEventListener = window.removeEventListener;
/**
* Houses custom event handlers to intercept on document + window event listeners.
*/
-var documentEventHandlers = {},
- windowEventHandlers = {};
+var documentEventHandlers = {};
+var windowEventHandlers = {};
-document.addEventListener = function(evt, handler, capture) {
+document.addEventListener = function (evt, handler, capture) {
var e = evt.toLowerCase();
- if (typeof documentEventHandlers[e] != 'undefined') {
+ if (typeof documentEventHandlers[e] !== 'undefined') {
documentEventHandlers[e].subscribe(handler);
} else {
m_document_addEventListener.call(document, evt, handler, capture);
}
};
-window.addEventListener = function(evt, handler, capture) {
+window.addEventListener = function (evt, handler, capture) {
var e = evt.toLowerCase();
- if (typeof windowEventHandlers[e] != 'undefined') {
+ if (typeof windowEventHandlers[e] !== 'undefined') {
windowEventHandlers[e].subscribe(handler);
} else {
m_window_addEventListener.call(window, evt, handler, capture);
}
};
-document.removeEventListener = function(evt, handler, capture) {
+document.removeEventListener = function (evt, handler, capture) {
var e = evt.toLowerCase();
// If unsubscribing from an event that is handled by a plugin
- if (typeof documentEventHandlers[e] != "undefined") {
+ if (typeof documentEventHandlers[e] !== 'undefined') {
documentEventHandlers[e].unsubscribe(handler);
} else {
m_document_removeEventListener.call(document, evt, handler, capture);
}
};
-window.removeEventListener = function(evt, handler, capture) {
+window.removeEventListener = function (evt, handler, capture) {
var e = evt.toLowerCase();
// If unsubscribing from an event that is handled by a plugin
- if (typeof windowEventHandlers[e] != "undefined") {
+ if (typeof windowEventHandlers[e] !== 'undefined') {
windowEventHandlers[e].unsubscribe(handler);
} else {
m_window_removeEventListener.call(window, evt, handler, capture);
}
};
-function createEvent(type, data) {
+function createEvent (type, data) {
var event = document.createEvent('Events');
event.initEvent(type, false, false);
if (data) {
@@ -179,29 +174,32 @@ function createEvent(type, data) {
return event;
}
-
+/* eslint-disable no-undef */
var cordova = {
- define:define,
- require:require,
- version:PLATFORM_VERSION_BUILD_LABEL,
- platformVersion:PLATFORM_VERSION_BUILD_LABEL,
- platformId:platform.id,
+ define: define,
+ require: require,
+ version: PLATFORM_VERSION_BUILD_LABEL,
+ platformVersion: PLATFORM_VERSION_BUILD_LABEL,
+ platformId: platform.id,
+
+ /* eslint-enable no-undef */
+
/**
* Methods to add/remove your own addEventListener hijacking on document + window.
*/
- addWindowEventHandler:function(event) {
+ addWindowEventHandler: function (event) {
return (windowEventHandlers[event] = channel.create(event));
},
- addStickyDocumentEventHandler:function(event) {
+ addStickyDocumentEventHandler: function (event) {
return (documentEventHandlers[event] = channel.createSticky(event));
},
- addDocumentEventHandler:function(event) {
+ addDocumentEventHandler: function (event) {
return (documentEventHandlers[event] = channel.create(event));
},
- removeWindowEventHandler:function(event) {
+ removeWindowEventHandler: function (event) {
delete windowEventHandlers[event];
},
- removeDocumentEventHandler:function(event) {
+ removeDocumentEventHandler: function (event) {
delete documentEventHandlers[event];
},
/**
@@ -209,24 +207,23 @@ var cordova = {
*
* @return object
*/
- getOriginalHandlers: function() {
+ getOriginalHandlers: function () {
return {'document': {'addEventListener': m_document_addEventListener, 'removeEventListener': m_document_removeEventListener},
- 'window': {'addEventListener': m_window_addEventListener, 'removeEventListener': m_window_removeEventListener}};
+ 'window': {'addEventListener': m_window_addEventListener, 'removeEventListener': m_window_removeEventListener}};
},
/**
* Method to fire event from native code
* bNoDetach is required for events which cause an exception which needs to be caught in native code
*/
- fireDocumentEvent: function(type, data, bNoDetach) {
+ fireDocumentEvent: function (type, data, bNoDetach) {
var evt = createEvent(type, data);
- if (typeof documentEventHandlers[type] != 'undefined') {
- if( bNoDetach ) {
+ if (typeof documentEventHandlers[type] !== 'undefined') {
+ if (bNoDetach) {
documentEventHandlers[type].fire(evt);
- }
- else {
- setTimeout(function() {
+ } else {
+ setTimeout(function () {
// Fire deviceready on listeners that were registered before cordova.js was loaded.
- if (type == 'deviceready') {
+ if (type === 'deviceready') {
document.dispatchEvent(evt);
}
documentEventHandlers[type].fire(evt);
@@ -236,10 +233,10 @@ var cordova = {
document.dispatchEvent(evt);
}
},
- fireWindowEvent: function(type, data) {
- var evt = createEvent(type,data);
- if (typeof windowEventHandlers[type] != 'undefined') {
- setTimeout(function() {
+ fireWindowEvent: function (type, data) {
+ var evt = createEvent(type, data);
+ if (typeof windowEventHandlers[type] !== 'undefined') {
+ setTimeout(function () {
windowEventHandlers[type].fire(evt);
}, 0);
} else {
@@ -253,7 +250,7 @@ var cordova = {
// Randomize the starting callbackId to avoid collisions after refreshing or navigating.
// This way, it's very unlikely that any new callback would get the same callbackId as an old callback.
callbackId: Math.floor(Math.random() * 2000000000),
- callbacks: {},
+ callbacks: {},
callbackStatus: {
NO_RESULT: 0,
OK: 1,
@@ -270,14 +267,14 @@ var cordova = {
/**
* Called by native code when returning successful result from an action.
*/
- callbackSuccess: function(callbackId, args) {
+ callbackSuccess: function (callbackId, args) {
cordova.callbackFromNative(callbackId, true, args.status, [args.message], args.keepCallback);
},
/**
* Called by native code when returning error result from an action.
*/
- callbackError: function(callbackId, args) {
+ callbackError: function (callbackId, args) {
// TODO: Deprecate callbackSuccess and callbackError in favour of callbackFromNative.
// Derive success from status.
cordova.callbackFromNative(callbackId, false, args.status, [args.message], args.keepCallback);
@@ -286,11 +283,11 @@ var cordova = {
/**
* Called by native code when returning the result from an action.
*/
- callbackFromNative: function(callbackId, isSuccess, status, args, keepCallback) {
+ callbackFromNative: function (callbackId, isSuccess, status, args, keepCallback) {
try {
var callback = cordova.callbacks[callbackId];
if (callback) {
- if (isSuccess && status == cordova.callbackStatus.OK) {
+ if (isSuccess && status === cordova.callbackStatus.OK) {
callback.success && callback.success.apply(null, args);
} else if (!isSuccess) {
callback.fail && callback.fail.apply(null, args);
@@ -307,26 +304,24 @@ var cordova = {
delete cordova.callbacks[callbackId];
}
}
- }
- catch (err) {
- var msg = "Error in " + (isSuccess ? "Success" : "Error") + " callbackId: " + callbackId + " : " + err;
+ } catch (err) {
+ var msg = 'Error in ' + (isSuccess ? 'Success' : 'Error') + ' callbackId: ' + callbackId + ' : ' + err;
console && console.log && console.log(msg);
- cordova.fireWindowEvent("cordovacallbackerror", { 'message': msg });
+ cordova.fireWindowEvent('cordovacallbackerror', { 'message': msg });
throw err;
}
},
- addConstructor: function(func) {
- channel.onCordovaReady.subscribe(function() {
+ addConstructor: function (func) {
+ channel.onCordovaReady.subscribe(function () {
try {
func();
- } catch(e) {
- console.log("Failed to run constructor: " + e);
+ } catch (e) {
+ console.log('Failed to run constructor: ' + e);
}
});
}
};
-
module.exports = cordova;
});
@@ -392,29 +387,29 @@ var typeMap = {
'O': 'Object'
};
-function extractParamName(callee, argIndex) {
+function extractParamName (callee, argIndex) {
return (/.*?\((.*?)\)/).exec(callee)[1].split(', ')[argIndex];
}
-function checkArgs(spec, functionName, args, opt_callee) {
+function checkArgs (spec, functionName, args, opt_callee) {
if (!moduleExports.enableChecks) {
return;
}
var errMsg = null;
var typeName;
for (var i = 0; i < spec.length; ++i) {
- var c = spec.charAt(i),
- cUpper = c.toUpperCase(),
- arg = args[i];
+ var c = spec.charAt(i);
+ var cUpper = c.toUpperCase();
+ var arg = args[i];
// Asterix means allow anything.
- if (c == '*') {
+ if (c === '*') {
continue;
}
typeName = utils.typeName(arg);
- if ((arg === null || arg === undefined) && c == cUpper) {
+ if ((arg === null || arg === undefined) && c === cUpper) {
continue;
}
- if (typeName != typeMap[cUpper]) {
+ if (typeName !== typeMap[cUpper]) {
errMsg = 'Expected ' + typeMap[cUpper];
break;
}
@@ -423,14 +418,14 @@ function checkArgs(spec, functionName, args, opt_callee) {
errMsg += ', but got ' + typeName + '.';
errMsg = 'Wrong type for parameter "' + extractParamName(opt_callee || args.callee, i) + '" of ' + functionName + ': ' + errMsg;
// Don't log when running unit tests.
- if (typeof jasmine == 'undefined') {
+ if (typeof jasmine === 'undefined') {
console.error(errMsg);
}
throw TypeError(errMsg);
}
}
-function getValue(value, defaultValue) {
+function getValue (value, defaultValue) {
return value === undefined ? defaultValue : value;
}
@@ -438,7 +433,6 @@ moduleExports.checkArgs = checkArgs;
moduleExports.getValue = getValue;
moduleExports.enableChecks = true;
-
});
// file: src/common/base64.js
@@ -446,58 +440,58 @@ define("cordova/base64", function(require, exports, module) {
var base64 = exports;
-base64.fromArrayBuffer = function(arrayBuffer) {
+base64.fromArrayBuffer = function (arrayBuffer) {
var array = new Uint8Array(arrayBuffer);
return uint8ToBase64(array);
};
-base64.toArrayBuffer = function(str) {
- var decodedStr = typeof atob != 'undefined' ? atob(str) : new Buffer(str,'base64').toString('binary');
+base64.toArrayBuffer = function (str) {
+ var decodedStr = typeof atob !== 'undefined' ? atob(str) : Buffer.from(str, 'base64').toString('binary'); // eslint-disable-line no-undef
var arrayBuffer = new ArrayBuffer(decodedStr.length);
var array = new Uint8Array(arrayBuffer);
- for (var i=0, len=decodedStr.length; i < len; i++) {
+ for (var i = 0, len = decodedStr.length; i < len; i++) {
array[i] = decodedStr.charCodeAt(i);
}
return arrayBuffer;
};
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
/* This code is based on the performance tests at http://jsperf.com/b64tests
* This 12-bit-at-a-time algorithm was the best performing version on all
* platforms tested.
*/
-var b64_6bit = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+var b64_6bit = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
var b64_12bit;
-var b64_12bitTable = function() {
+var b64_12bitTable = function () {
b64_12bit = [];
- for (var i=0; i<64; i++) {
- for (var j=0; j<64; j++) {
- b64_12bit[i*64+j] = b64_6bit[i] + b64_6bit[j];
+ for (var i = 0; i < 64; i++) {
+ for (var j = 0; j < 64; j++) {
+ b64_12bit[i * 64 + j] = b64_6bit[i] + b64_6bit[j];
}
}
- b64_12bitTable = function() { return b64_12bit; };
+ b64_12bitTable = function () { return b64_12bit; };
return b64_12bit;
};
-function uint8ToBase64(rawData) {
+function uint8ToBase64 (rawData) {
var numBytes = rawData.byteLength;
- var output="";
+ var output = '';
var segment;
var table = b64_12bitTable();
- for (var i=0;i<numBytes-2;i+=3) {
- segment = (rawData[i] << 16) + (rawData[i+1] << 8) + rawData[i+2];
+ for (var i = 0; i < numBytes - 2; i += 3) {
+ segment = (rawData[i] << 16) + (rawData[i + 1] << 8) + rawData[i + 2];
output += table[segment >> 12];
output += table[segment & 0xfff];
}
- if (numBytes - i == 2) {
- segment = (rawData[i] << 16) + (rawData[i+1] << 8);
+ if (numBytes - i === 2) {
+ segment = (rawData[i] << 16) + (rawData[i + 1] << 8);
output += table[segment >> 12];
output += b64_6bit[(segment & 0xfff) >> 6];
output += '=';
- } else if (numBytes - i == 1) {
+ } else if (numBytes - i === 1) {
segment = (rawData[i] << 16);
output += table[segment >> 12];
output += '==';
@@ -512,7 +506,7 @@ define("cordova/builder", function(require, exports, module) {
var utils = require('cordova/utils');
-function each(objects, func, context) {
+function each (objects, func, context) {
for (var prop in objects) {
if (objects.hasOwnProperty(prop)) {
func.apply(context, [objects[prop], prop]);
@@ -520,7 +514,7 @@ function each(objects, func, context) {
}
}
-function clobber(obj, key, value) {
+function clobber (obj, key, value) {
exports.replaceHookForTesting(obj, key);
var needsProperty = false;
try {
@@ -530,15 +524,15 @@ function clobber(obj, key, value) {
}
// Getters can only be overridden by getters.
if (needsProperty || obj[key] !== value) {
- utils.defineGetter(obj, key, function() {
+ utils.defineGetter(obj, key, function () {
return value;
});
}
}
-function assignOrWrapInDeprecateGetter(obj, key, value, message) {
+function assignOrWrapInDeprecateGetter (obj, key, value, message) {
if (message) {
- utils.defineGetter(obj, key, function() {
+ utils.defineGetter(obj, key, function () {
console.log(message);
delete obj[key];
clobber(obj, key, value);
@@ -549,7 +543,7 @@ function assignOrWrapInDeprecateGetter(obj, key, value, message) {
}
}
-function include(parent, objects, clobber, merge) {
+function include (parent, objects, clobber, merge) {
each(objects, function (obj, key) {
try {
var result = obj.path ? require(obj.path) : {};
@@ -569,7 +563,7 @@ function include(parent, objects, clobber, merge) {
result = parent[key];
} else {
// Overwrite if not currently defined.
- if (typeof parent[key] == 'undefined') {
+ if (typeof parent[key] === 'undefined') {
assignOrWrapInDeprecateGetter(parent, key, result, obj.deprecated);
} else {
// Set result to what already exists, so we can build children into it if they exist.
@@ -580,7 +574,7 @@ function include(parent, objects, clobber, merge) {
if (obj.children) {
include(result, obj.children, clobber, merge);
}
- } catch(e) {
+ } catch (e) {
utils.alert('Exception building Cordova JS globals: ' + e + ' for key "' + key + '"');
}
});
@@ -593,7 +587,7 @@ function include(parent, objects, clobber, merge) {
* @param target Object to merge properties into.
* @param src Object to merge properties from.
*/
-function recursiveMerge(target, src) {
+function recursiveMerge (target, src) {
for (var prop in src) {
if (src.hasOwnProperty(prop)) {
if (target.prototype && target.prototype.constructor === target) {
@@ -610,26 +604,26 @@ function recursiveMerge(target, src) {
}
}
-exports.buildIntoButDoNotClobber = function(objects, target) {
+exports.buildIntoButDoNotClobber = function (objects, target) {
include(target, objects, false, false);
};
-exports.buildIntoAndClobber = function(objects, target) {
+exports.buildIntoAndClobber = function (objects, target) {
include(target, objects, true, false);
};
-exports.buildIntoAndMerge = function(objects, target) {
+exports.buildIntoAndMerge = function (objects, target) {
include(target, objects, true, true);
};
exports.recursiveMerge = recursiveMerge;
exports.assignOrWrapInDeprecateGetter = assignOrWrapInDeprecateGetter;
-exports.replaceHookForTesting = function() {};
+exports.replaceHookForTesting = function () {};
});
// file: src/common/channel.js
define("cordova/channel", function(require, exports, module) {
-var utils = require('cordova/utils'),
- nextGuid = 1;
+var utils = require('cordova/utils');
+var nextGuid = 1;
/**
* Custom pub-sub "channel" that can have functions subscribed to it
@@ -669,7 +663,7 @@ var utils = require('cordova/utils'),
* @constructor
* @param type String the channel name
*/
-var Channel = function(type, sticky) {
+var Channel = function (type, sticky) {
this.type = type;
// Map of guid -> function.
this.handlers = {};
@@ -682,72 +676,73 @@ var Channel = function(type, sticky) {
// Function that is called when the first listener is subscribed, or when
// the last listener is unsubscribed.
this.onHasSubscribersChange = null;
-},
- channel = {
- /**
- * Calls the provided function only after all of the channels specified
- * have been fired. All channels must be sticky channels.
- */
- join: function(h, c) {
- var len = c.length,
- i = len,
- f = function() {
- if (!(--i)) h();
- };
- for (var j=0; j<len; j++) {
- if (c[j].state === 0) {
- throw Error('Can only use join with sticky channels.');
- }
- c[j].subscribe(f);
- }
- if (!len) h();
- },
- create: function(type) {
- return channel[type] = new Channel(type, false);
- },
- createSticky: function(type) {
- return channel[type] = new Channel(type, true);
- },
-
- /**
- * cordova Channels that must fire before "deviceready" is fired.
- */
- deviceReadyChannelsArray: [],
- deviceReadyChannelsMap: {},
-
- /**
- * Indicate that a feature needs to be initialized before it is ready to be used.
- * This holds up Cordova's "deviceready" event until the feature has been initialized
- * and Cordova.initComplete(feature) is called.
- *
- * @param feature {String} The unique feature name
- */
- waitForInitialization: function(feature) {
- if (feature) {
- var c = channel[feature] || this.createSticky(feature);
- this.deviceReadyChannelsMap[feature] = c;
- this.deviceReadyChannelsArray.push(c);
- }
- },
-
- /**
- * Indicate that initialization code has completed and the feature is ready to be used.
- *
- * @param feature {String} The unique feature name
- */
- initializationComplete: function(feature) {
- var c = this.deviceReadyChannelsMap[feature];
- if (c) {
- c.fire();
+};
+var channel = {
+ /**
+ * Calls the provided function only after all of the channels specified
+ * have been fired. All channels must be sticky channels.
+ */
+ join: function (h, c) {
+ var len = c.length;
+ var i = len;
+ var f = function () {
+ if (!(--i)) h();
+ };
+ for (var j = 0; j < len; j++) {
+ if (c[j].state === 0) {
+ throw Error('Can only use join with sticky channels.');
}
+ c[j].subscribe(f);
}
- };
+ if (!len) h();
+ },
+ /* eslint-disable no-return-assign */
+ create: function (type) {
+ return channel[type] = new Channel(type, false);
+ },
+ createSticky: function (type) {
+ return channel[type] = new Channel(type, true);
+ },
+ /* eslint-enable no-return-assign */
+ /**
+ * cordova Channels that must fire before "deviceready" is fired.
+ */
+ deviceReadyChannelsArray: [],
+ deviceReadyChannelsMap: {},
-function checkSubscriptionArgument(argument) {
- if (typeof argument !== "function" && typeof argument.handleEvent !== "function") {
+ /**
+ * Indicate that a feature needs to be initialized before it is ready to be used.
+ * This holds up Cordova's "deviceready" event until the feature has been initialized
+ * and Cordova.initComplete(feature) is called.
+ *
+ * @param feature {String} The unique feature name
+ */
+ waitForInitialization: function (feature) {
+ if (feature) {
+ var c = channel[feature] || this.createSticky(feature);
+ this.deviceReadyChannelsMap[feature] = c;
+ this.deviceReadyChannelsArray.push(c);
+ }
+ },
+
+ /**
+ * Indicate that initialization code has completed and the feature is ready to be used.
+ *
+ * @param feature {String} The unique feature name
+ */
+ initializationComplete: function (feature) {
+ var c = this.deviceReadyChannelsMap[feature];
+ if (c) {
+ c.fire();
+ }
+ }
+};
+
+function checkSubscriptionArgument (argument) {
+ if (typeof argument !== 'function' && typeof argument.handleEvent !== 'function') {
throw new Error(
- "Must provide a function or an EventListener object " +
- "implementing the handleEvent interface."
+ 'Must provide a function or an EventListener object ' +
+ 'implementing the handleEvent interface.'
);
}
}
@@ -759,11 +754,11 @@ function checkSubscriptionArgument(argument) {
* and a guid that can be used to stop subscribing to the channel.
* Returns the guid.
*/
-Channel.prototype.subscribe = function(eventListenerOrFunction, eventListener) {
+Channel.prototype.subscribe = function (eventListenerOrFunction, eventListener) {
checkSubscriptionArgument(eventListenerOrFunction);
var handleEvent, guid;
- if (eventListenerOrFunction && typeof eventListenerOrFunction === "object") {
+ if (eventListenerOrFunction && typeof eventListenerOrFunction === 'object') {
// Received an EventListener object implementing the handleEvent interface
handleEvent = eventListenerOrFunction.handleEvent;
eventListener = eventListenerOrFunction;
@@ -772,13 +767,13 @@ Channel.prototype.subscribe = function(eventListenerOrFunction, eventListener) {
handleEvent = eventListenerOrFunction;
}
- if (this.state == 2) {
+ if (this.state === 2) {
handleEvent.apply(eventListener || this, this.fireArgs);
return;
}
guid = eventListenerOrFunction.observer_guid;
- if (typeof eventListener === "object") {
+ if (typeof eventListener === 'object') {
handleEvent = utils.close(eventListener, handleEvent);
}
@@ -793,7 +788,7 @@ Channel.prototype.subscribe = function(eventListenerOrFunction, eventListener) {
if (!this.handlers[guid]) {
this.handlers[guid] = handleEvent;
this.numHandlers++;
- if (this.numHandlers == 1) {
+ if (this.numHandlers === 1) {
this.onHasSubscribersChange && this.onHasSubscribersChange();
}
}
@@ -802,11 +797,11 @@ Channel.prototype.subscribe = function(eventListenerOrFunction, eventListener) {
/**
* Unsubscribes the function with the given guid from the channel.
*/
-Channel.prototype.unsubscribe = function(eventListenerOrFunction) {
+Channel.prototype.unsubscribe = function (eventListenerOrFunction) {
checkSubscriptionArgument(eventListenerOrFunction);
var handleEvent, guid, handler;
- if (eventListenerOrFunction && typeof eventListenerOrFunction === "object") {
+ if (eventListenerOrFunction && typeof eventListenerOrFunction === 'object') {
// Received an EventListener object implementing the handleEvent interface
handleEvent = eventListenerOrFunction.handleEvent;
} else {
@@ -828,11 +823,11 @@ Channel.prototype.unsubscribe = function(eventListenerOrFunction) {
/**
* Calls all functions subscribed to this channel.
*/
-Channel.prototype.fire = function(e) {
- var fail = false,
- fireArgs = Array.prototype.slice.call(arguments);
+Channel.prototype.fire = function (e) {
+ var fail = false; // eslint-disable-line no-unused-vars
+ var fireArgs = Array.prototype.slice.call(arguments);
// Apply stickiness.
- if (this.state == 1) {
+ if (this.state === 1) {
this.state = 2;
this.fireArgs = fireArgs;
}
@@ -846,7 +841,7 @@ Channel.prototype.fire = function(e) {
for (var i = 0; i < toCall.length; ++i) {
toCall[i].apply(this, fireArgs);
}
- if (this.state == 2 && this.numHandlers) {
+ if (this.state === 2 && this.numHandlers) {
this.numHandlers = 0;
this.handlers = {};
this.onHasSubscribersChange && this.onHasSubscribersChange();
@@ -854,7 +849,6 @@ Channel.prototype.fire = function(e) {
}
};
-
// defining them here so they are ready super fast!
// DOM event that is received when the web page is loaded and parsed.
channel.createSticky('onDOMContentLoaded');
@@ -1172,31 +1166,31 @@ module.exports = androidExec;
// file: src/common/exec/proxy.js
define("cordova/exec/proxy", function(require, exports, module) {
-
// internal map of proxy function
var CommandProxyMap = {};
module.exports = {
// example: cordova.commandProxy.add("Accelerometer",{getCurrentAcceleration: function(successCallback, errorCallback, options) {...},...);
- add:function(id,proxyObj) {
- console.log("adding proxy for " + id);
+ add: function (id, proxyObj) {
+ console.log('adding proxy for ' + id);
CommandProxyMap[id] = proxyObj;
return proxyObj;
},
// cordova.commandProxy.remove("Accelerometer");
- remove:function(id) {
+ remove: function (id) {
var proxy = CommandProxyMap[id];
delete CommandProxyMap[id];
CommandProxyMap[id] = null;
return proxy;
},
- get:function(service,action) {
- return ( CommandProxyMap[service] ? CommandProxyMap[service][action] : null );
+ get: function (service, action) {
+ return (CommandProxyMap[service] ? CommandProxyMap[service][action] : null);
}
};
+
});
// file: src/common/init.js
@@ -1211,16 +1205,16 @@ var utils = require('cordova/utils');
var platformInitChannelsArray = [channel.onNativeReady, channel.onPluginsReady];
-function logUnfiredChannels(arr) {
+function logUnfiredChannels (arr) {
for (var i = 0; i < arr.length; ++i) {
- if (arr[i].state != 2) {
+ if (arr[i].state !== 2) {
console.log('Channel not fired: ' + arr[i].type);
}
}
}
-window.setTimeout(function() {
- if (channel.onDeviceReady.state != 2) {
+window.setTimeout(function () {
+ if (channel.onDeviceReady.state !== 2) {
console.log('deviceready has not fired after 5 seconds.');
logUnfiredChannels(platformInitChannelsArray);
logUnfiredChannels(channel.deviceReadyChannelsArray);
@@ -1229,20 +1223,19 @@ window.setTimeout(function() {
// Replace navigator before any modules are required(), to ensure it happens as soon as possible.
// We replace it so that properties that can't be clobbered can instead be overridden.
-function replaceNavigator(origNavigator) {
- var CordovaNavigator = function() {};
+function replaceNavigator (origNavigator) {
+ var CordovaNavigator = function () {};
CordovaNavigator.prototype = origNavigator;
var newNavigator = new CordovaNavigator();
// This work-around really only applies to new APIs that are newer than Function.bind.
// Without it, APIs such as getGamepads() break.
if (CordovaNavigator.bind) {
for (var key in origNavigator) {
- if (typeof origNavigator[key] == 'function') {
+ if (typeof origNavigator[key] === 'function') {
newNavigator[key] = origNavigator[key].bind(origNavigator);
- }
- else {
- (function(k) {
- utils.defineGetterSetter(newNavigator,key,function() {
+ } else {
+ (function (k) {
+ utils.defineGetterSetter(newNavigator, key, function () {
return origNavigator[k];
});
})(key);
@@ -1258,12 +1251,12 @@ if (window.navigator) {
if (!window.console) {
window.console = {
- log: function(){}
+ log: function () {}
};
}
if (!window.console.warn) {
- window.console.warn = function(msg) {
- this.log("warn: " + msg);
+ window.console.warn = function (msg) {
+ this.log('warn: ' + msg);
};
}
@@ -1274,10 +1267,10 @@ channel.onActivated = cordova.addDocumentEventHandler('activated');
channel.onDeviceReady = cordova.addStickyDocumentEventHandler('deviceready');
// Listen for DOMContentLoaded and notify our channel subscribers.
-if (document.readyState == 'complete' || document.readyState == 'interactive') {
+if (document.readyState === 'complete' || document.readyState === 'interactive') {
channel.onDOMContentLoaded.fire();
} else {
- document.addEventListener('DOMContentLoaded', function() {
+ document.addEventListener('DOMContentLoaded', function () {
channel.onDOMContentLoaded.fire();
}, false);
}
@@ -1298,8 +1291,8 @@ platform.bootstrap && platform.bootstrap();
// Wrap in a setTimeout to support the use-case of having plugin JS appended to cordova.js.
// The delay allows the attached modules to be defined before the plugin loader looks for them.
-setTimeout(function() {
- pluginloader.load(function() {
+setTimeout(function () {
+ pluginloader.load(function () {
channel.onPluginsReady.fire();
});
}, 0);
@@ -1307,7 +1300,7 @@ setTimeout(function() {
/**
* Create all cordova objects once native side is ready.
*/
-channel.join(function() {
+channel.join(function () {
modulemapper.mapModules(window);
platform.initialize && platform.initialize();
@@ -1318,13 +1311,12 @@ channel.join(function() {
// Fire onDeviceReady event once page has fully loaded, all
// constructors have run and cordova info has been received from native
// side.
- channel.join(function() {
+ channel.join(function () {
require('cordova').fireDocumentEvent('deviceready');
}, channel.deviceReadyChannelsArray);
}, platformInitChannelsArray);
-
});
// file: src/common/init_b.js
@@ -1342,16 +1334,16 @@ var platformInitChannelsArray = [channel.onDOMContentLoaded, channel.onNativeRea
// setting exec
cordova.exec = require('cordova/exec');
-function logUnfiredChannels(arr) {
+function logUnfiredChannels (arr) {
for (var i = 0; i < arr.length; ++i) {
- if (arr[i].state != 2) {
+ if (arr[i].state !== 2) {
console.log('Channel not fired: ' + arr[i].type);
}
}
}
-window.setTimeout(function() {
- if (channel.onDeviceReady.state != 2) {
+window.setTimeout(function () {
+ if (channel.onDeviceReady.state !== 2) {
console.log('deviceready has not fired after 5 seconds.');
logUnfiredChannels(platformInitChannelsArray);
logUnfiredChannels(channel.deviceReadyChannelsArray);
@@ -1360,20 +1352,19 @@ window.setTimeout(function() {
// Replace navigator before any modules are required(), to ensure it happens as soon as possible.
// We replace it so that properties that can't be clobbered can instead be overridden.
-function replaceNavigator(origNavigator) {
- var CordovaNavigator = function() {};
+function replaceNavigator (origNavigator) {
+ var CordovaNavigator = function () {};
CordovaNavigator.prototype = origNavigator;
var newNavigator = new CordovaNavigator();
// This work-around really only applies to new APIs that are newer than Function.bind.
// Without it, APIs such as getGamepads() break.
if (CordovaNavigator.bind) {
for (var key in origNavigator) {
- if (typeof origNavigator[key] == 'function') {
+ if (typeof origNavigator[key] === 'function') {
newNavigator[key] = origNavigator[key].bind(origNavigator);
- }
- else {
- (function(k) {
- utils.defineGetterSetter(newNavigator,key,function() {
+ } else {
+ (function (k) {
+ utils.defineGetterSetter(newNavigator, key, function () {
return origNavigator[k];
});
})(key);
@@ -1388,12 +1379,12 @@ if (window.navigator) {
if (!window.console) {
window.console = {
- log: function(){}
+ log: function () {}
};
}
if (!window.console.warn) {
- window.console.warn = function(msg) {
- this.log("warn: " + msg);
+ window.console.warn = function (msg) {
+ this.log('warn: ' + msg);
};
}
@@ -1404,10 +1395,10 @@ channel.onActivated = cordova.addDocumentEventHandler('activated');
channel.onDeviceReady = cordova.addStickyDocumentEventHandler('deviceready');
// Listen for DOMContentLoaded and notify our channel subscribers.
-if (document.readyState == 'complete' || document.readyState == 'interactive') {
+if (document.readyState === 'complete' || document.readyState === 'interactive') {
channel.onDOMContentLoaded.fire();
} else {
- document.addEventListener('DOMContentLoaded', function() {
+ document.addEventListener('DOMContentLoaded', function () {
channel.onDOMContentLoaded.fire();
}, false);
}
@@ -1424,8 +1415,8 @@ platform.bootstrap && platform.bootstrap();
// Wrap in a setTimeout to support the use-case of having plugin JS appended to cordova.js.
// The delay allows the attached modules to be defined before the plugin loader looks for them.
-setTimeout(function() {
- pluginloader.load(function() {
+setTimeout(function () {
+ pluginloader.load(function () {
channel.onPluginsReady.fire();
});
}, 0);
@@ -1433,7 +1424,7 @@ setTimeout(function() {
/**
* Create all cordova objects once native side is ready.
*/
-channel.join(function() {
+channel.join(function () {
modulemapper.mapModules(window);
platform.initialize && platform.initialize();
@@ -1444,7 +1435,7 @@ channel.join(function() {
// Fire onDeviceReady event once page has fully loaded, all
// constructors have run and cordova info has been received from native
// side.
- channel.join(function() {
+ channel.join(function () {
require('cordova').fireDocumentEvent('deviceready');
}, channel.deviceReadyChannelsArray);
@@ -1455,17 +1446,17 @@ channel.join(function() {
// file: src/common/modulemapper.js
define("cordova/modulemapper", function(require, exports, module) {
-var builder = require('cordova/builder'),
- moduleMap = define.moduleMap,
- symbolList,
- deprecationMap;
+var builder = require('cordova/builder');
+var moduleMap = define.moduleMap; // eslint-disable-line no-undef
+var symbolList;
+var deprecationMap;
-exports.reset = function() {
+exports.reset = function () {
symbolList = [];
deprecationMap = {};
};
-function addEntry(strategy, moduleName, symbolPath, opt_deprecationMessage) {
+function addEntry (strategy, moduleName, symbolPath, opt_deprecationMessage) {
if (!(moduleName in moduleMap)) {
throw new Error('Module ' + moduleName + ' does not exist.');
}
@@ -1476,35 +1467,35 @@ function addEntry(strategy, moduleName, symbolPath, opt_deprecationMessage) {
}
// Note: Android 2.3 does have Function.bind().
-exports.clobbers = function(moduleName, symbolPath, opt_deprecationMessage) {
+exports.clobbers = function (moduleName, symbolPath, opt_deprecationMessage) {
addEntry('c', moduleName, symbolPath, opt_deprecationMessage);
};
-exports.merges = function(moduleName, symbolPath, opt_deprecationMessage) {
+exports.merges = function (moduleName, symbolPath, opt_deprecationMessage) {
addEntry('m', moduleName, symbolPath, opt_deprecationMessage);
};
-exports.defaults = function(moduleName, symbolPath, opt_deprecationMessage) {
+exports.defaults = function (moduleName, symbolPath, opt_deprecationMessage) {
addEntry('d', moduleName, symbolPath, opt_deprecationMessage);
};
-exports.runs = function(moduleName) {
+exports.runs = function (moduleName) {
addEntry('r', moduleName, null);
};
-function prepareNamespace(symbolPath, context) {
+function prepareNamespace (symbolPath, context) {
if (!symbolPath) {
return context;
}
var parts = symbolPath.split('.');
var cur = context;
- for (var i = 0, part; part = parts[i]; ++i) {
+ for (var i = 0, part; part = parts[i]; ++i) { // eslint-disable-line no-cond-assign
cur = cur[part] = cur[part] || {};
}
return cur;
}
-exports.mapModules = function(context) {
+exports.mapModules = function (context) {
var origSymbols = {};
context.CDV_origSymbols = origSymbols;
for (var i = 0, len = symbolList.length; i < len; i += 3) {
@@ -1512,7 +1503,7 @@ exports.mapModules = function(context) {
var moduleName = symbolList[i + 1];
var module = require(moduleName);
// <runs/>
- if (strategy == 'r') {
+ if (strategy === 'r') {
continue;
}
var symbolPath = symbolList[i + 2];
@@ -1524,9 +1515,9 @@ exports.mapModules = function(context) {
var parentObj = prepareNamespace(namespace, context);
var target = parentObj[lastName];
- if (strategy == 'm' && target) {
+ if (strategy === 'm' && target) {
builder.recursiveMerge(target, module);
- } else if ((strategy == 'd' && !target) || (strategy != 'd')) {
+ } else if ((strategy === 'd' && !target) || (strategy !== 'd')) {
if (!(symbolPath in origSymbols)) {
origSymbols[symbolPath] = target;
}
@@ -1535,7 +1526,7 @@ exports.mapModules = function(context) {
}
};
-exports.getOriginalSymbol = function(context, symbolPath) {
+exports.getOriginalSymbol = function (context, symbolPath) {
var origSymbols = context.CDV_origSymbols;
if (origSymbols && (symbolPath in origSymbols)) {
return origSymbols[symbolPath];
@@ -1550,22 +1541,21 @@ exports.getOriginalSymbol = function(context, symbolPath) {
exports.reset();
-
});
// file: src/common/modulemapper_b.js
define("cordova/modulemapper_b", function(require, exports, module) {
-var builder = require('cordova/builder'),
- symbolList = [],
- deprecationMap;
+var builder = require('cordova/builder');
+var symbolList = [];
+var deprecationMap;
-exports.reset = function() {
+exports.reset = function () {
symbolList = [];
deprecationMap = {};
};
-function addEntry(strategy, moduleName, symbolPath, opt_deprecationMessage) {
+function addEntry (strategy, moduleName, symbolPath, opt_deprecationMessage) {
symbolList.push(strategy, moduleName, symbolPath);
if (opt_deprecationMessage) {
deprecationMap[symbolPath] = opt_deprecationMessage;
@@ -1573,35 +1563,35 @@ function addEntry(strategy, moduleName, symbolPath, opt_deprecationMessage) {
}
// Note: Android 2.3 does have Function.bind().
-exports.clobbers = function(moduleName, symbolPath, opt_deprecationMessage) {
+exports.clobbers = function (moduleName, symbolPath, opt_deprecationMessage) {
addEntry('c', moduleName, symbolPath, opt_deprecationMessage);
};
-exports.merges = function(moduleName, symbolPath, opt_deprecationMessage) {
+exports.merges = function (moduleName, symbolPath, opt_deprecationMessage) {
addEntry('m', moduleName, symbolPath, opt_deprecationMessage);
};
-exports.defaults = function(moduleName, symbolPath, opt_deprecationMessage) {
+exports.defaults = function (moduleName, symbolPath, opt_deprecationMessage) {
addEntry('d', moduleName, symbolPath, opt_deprecationMessage);
};
-exports.runs = function(moduleName) {
+exports.runs = function (moduleName) {
addEntry('r', moduleName, null);
};
-function prepareNamespace(symbolPath, context) {
+function prepareNamespace (symbolPath, context) {
if (!symbolPath) {
return context;
}
var parts = symbolPath.split('.');
var cur = context;
- for (var i = 0, part; part = parts[i]; ++i) {
+ for (var i = 0, part; part = parts[i]; ++i) { // eslint-disable-line no-cond-assign
cur = cur[part] = cur[part] || {};
}
return cur;
}
-exports.mapModules = function(context) {
+exports.mapModules = function (context) {
var origSymbols = {};
context.CDV_origSymbols = origSymbols;
for (var i = 0, len = symbolList.length; i < len; i += 3) {
@@ -1609,7 +1599,7 @@ exports.mapModules = function(context) {
var moduleName = symbolList[i + 1];
var module = require(moduleName);
// <runs/>
- if (strategy == 'r') {
+ if (strategy === 'r') {
continue;
}
var symbolPath = symbolList[i + 2];
@@ -1621,9 +1611,9 @@ exports.mapModules = function(context) {
var parentObj = prepareNamespace(namespace, context);
var target = parentObj[lastName];
- if (strategy == 'm' && target) {
+ if (strategy === 'm' && target) {
builder.recursiveMerge(target, module);
- } else if ((strategy == 'd' && !target) || (strategy != 'd')) {
+ } else if ((strategy === 'd' && !target) || (strategy !== 'd')) {
if (!(symbolPath in origSymbols)) {
origSymbols[symbolPath] = target;
}
@@ -1632,7 +1622,7 @@ exports.mapModules = function(context) {
}
};
-exports.getOriginalSymbol = function(context, symbolPath) {
+exports.getOriginalSymbol = function (context, symbolPath) {
var origSymbols = context.CDV_origSymbols;
if (origSymbols && (symbolPath in origSymbols)) {
return origSymbols[symbolPath];
@@ -1647,7 +1637,6 @@ exports.getOriginalSymbol = function(context, symbolPath) {
exports.reset();
-
});
// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/platform.js
@@ -1857,12 +1846,11 @@ module.exports = {
define("cordova/pluginloader", function(require, exports, module) {
var modulemapper = require('cordova/modulemapper');
-var urlutil = require('cordova/urlutil');
// Helper function to inject a <script> tag.
// Exported for testing.
-exports.injectScript = function(url, onload, onerror) {
- var script = document.createElement("script");
+exports.injectScript = function (url, onload, onerror) {
+ var script = document.createElement('script');
// onload fires even when script fails loads with an error.
script.onload = onload;
// onerror fires for malformed URLs.
@@ -1871,13 +1859,13 @@ exports.injectScript = function(url, onload, onerror) {
document.head.appendChild(script);
};
-function injectIfNecessary(id, url, onload, onerror) {
+function injectIfNecessary (id, url, onload, onerror) {
onerror = onerror || onload;
- if (id in define.moduleMap) {
+ if (id in define.moduleMap) { // eslint-disable-line no-undef
onload();
} else {
- exports.injectScript(url, function() {
- if (id in define.moduleMap) {
+ exports.injectScript(url, function () {
+ if (id in define.moduleMap) { // eslint-disable-line no-undef
onload();
} else {
onerror();
@@ -1886,9 +1874,9 @@ function injectIfNecessary(id, url, onload, onerror) {
}
}
-function onScriptLoadingComplete(moduleList, finishPluginLoading) {
+function onScriptLoadingComplete (moduleList, finishPluginLoading) {
// Loop through all the plugins and then through their clobbers and merges.
- for (var i = 0, module; module = moduleList[i]; i++) {
+ for (var i = 0, module; module = moduleList[i]; i++) { // eslint-disable-line no-cond-assign
if (module.clobbers && module.clobbers.length) {
for (var j = 0; j < module.clobbers.length; j++) {
modulemapper.clobbers(module.id, module.clobbers[j]);
@@ -1914,7 +1902,7 @@ function onScriptLoadingComplete(moduleList, finishPluginLoading) {
// See plugman's plugin_loader.js for the details of this object.
// This function is only called if the really is a plugins array that isn't empty.
// Otherwise the onerror response handler will just call finishPluginLoading().
-function handlePluginsObject(path, moduleList, finishPluginLoading) {
+function handlePluginsObject (path, moduleList, finishPluginLoading) {
// Now inject the scripts.
var scriptCounter = moduleList.length;
@@ -1922,7 +1910,7 @@ function handlePluginsObject(path, moduleList, finishPluginLoading) {
finishPluginLoading();
return;
}
- function scriptLoadedCallback() {
+ function scriptLoadedCallback () {
if (!--scriptCounter) {
onScriptLoadingComplete(moduleList, finishPluginLoading);
}
@@ -1933,13 +1921,13 @@ function handlePluginsObject(path, moduleList, finishPluginLoading) {
}
}
-function findCordovaPath() {
+function findCordovaPath () {
var path = null;
var scripts = document.getElementsByTagName('script');
var term = '/cordova.js';
- for (var n = scripts.length-1; n>-1; n--) {
+ for (var n = scripts.length - 1; n > -1; n--) {
var src = scripts[n].src.replace(/\?.*$/, ''); // Strip any query param (CB-6007).
- if (src.indexOf(term) == (src.length - term.length)) {
+ if (src.indexOf(term) === (src.length - term.length)) {
path = src.substring(0, src.length - term.length) + '/';
break;
}
@@ -1950,19 +1938,18 @@ function findCordovaPath() {
// Tries to load all plugins' js-modules.
// This is an async process, but onDeviceReady is blocked on onPluginsReady.
// onPluginsReady is fired when there are no plugins to load, or they are all done.
-exports.load = function(callback) {
+exports.load = function (callback) {
var pathPrefix = findCordovaPath();
if (pathPrefix === null) {
console.log('Could not find cordova.js script tag. Plugin loading may fail.');
pathPrefix = '';
}
- injectIfNecessary('cordova/plugin_list', pathPrefix + 'cordova_plugins.js', function() {
- var moduleList = require("cordova/plugin_list");
+ injectIfNecessary('cordova/plugin_list', pathPrefix + 'cordova_plugins.js', function () {
+ var moduleList = require('cordova/plugin_list');
handlePluginsObject(pathPrefix, moduleList, callback);
}, callback);
};
-
});
// file: src/common/pluginloader_b.js
@@ -1972,14 +1959,14 @@ var modulemapper = require('cordova/modulemapper');
// Handler for the cordova_plugins.js content.
// See plugman's plugin_loader.js for the details of this object.
-function handlePluginsObject(moduleList) {
+function handlePluginsObject (moduleList) {
// if moduleList is not defined or empty, we've nothing to do
if (!moduleList || !moduleList.length) {
return;
}
// Loop through all the modules and then through their clobbers and merges.
- for (var i = 0, module; module = moduleList[i]; i++) {
+ for (var i = 0, module; module = moduleList[i]; i++) { // eslint-disable-line no-cond-assign
if (module.clobbers && module.clobbers.length) {
for (var j = 0; j < module.clobbers.length; j++) {
modulemapper.clobbers(module.id, module.clobbers[j]);
@@ -2003,31 +1990,28 @@ function handlePluginsObject(moduleList) {
// but the method accepts callback to be compatible with non-browserify flow.
// onDeviceReady is blocked on onPluginsReady. onPluginsReady is fired when there are
// no plugins to load, or they are all done.
-exports.load = function(callback) {
- var moduleList = require("cordova/plugin_list");
+exports.load = function (callback) {
+ var moduleList = require('cordova/plugin_list');
handlePluginsObject(moduleList);
callback();
};
-
});
// file: src/common/urlutil.js
define("cordova/urlutil", function(require, exports, module) {
-
/**
* For already absolute URLs, returns what is passed in.
* For relative URLs, converts them to absolute ones.
*/
-exports.makeAbsolute = function makeAbsolute(url) {
+exports.makeAbsolute = function makeAbsolute (url) {
var anchorEl = document.createElement('a');
anchorEl.href = url;
return anchorEl.href;
};
-
});
// file: src/common/utils.js
@@ -2038,7 +2022,7 @@ var utils = exports;
/**
* Defines a property getter / setter for obj[key].
*/
-utils.defineGetterSetter = function(obj, key, getFunc, opt_setFunc) {
+utils.defineGetterSetter = function (obj, key, getFunc, opt_setFunc) {
if (Object.defineProperty) {
var desc = {
get: getFunc,
@@ -2061,13 +2045,13 @@ utils.defineGetterSetter = function(obj, key, getFunc, opt_setFunc) {
*/
utils.defineGetter = utils.defineGetterSetter;
-utils.arrayIndexOf = function(a, item) {
+utils.arrayIndexOf = function (a, item) {
if (a.indexOf) {
return a.indexOf(item);
}
var len = a.length;
for (var i = 0; i < len; ++i) {
- if (a[i] == item) {
+ if (a[i] === item) {
return i;
}
}
@@ -2077,15 +2061,15 @@ utils.arrayIndexOf = function(a, item) {
/**
* Returns whether the item was found in the array.
*/
-utils.arrayRemove = function(a, item) {
+utils.arrayRemove = function (a, item) {
var index = utils.arrayIndexOf(a, item);
- if (index != -1) {
+ if (index !== -1) {
a.splice(index, 1);
}
- return index != -1;
+ return index !== -1;
};
-utils.typeName = function(val) {
+utils.typeName = function (val) {
return Object.prototype.toString.call(val).slice(8, -1);
};
@@ -2093,39 +2077,39 @@ utils.typeName = function(val) {
* Returns an indication of whether the argument is an array or not
*/
utils.isArray = Array.isArray ||
- function(a) {return utils.typeName(a) == 'Array';};
+ function (a) { return utils.typeName(a) === 'Array'; };
/**
* Returns an indication of whether the argument is a Date or not
*/
-utils.isDate = function(d) {
+utils.isDate = function (d) {
return (d instanceof Date);
};
/**
* Does a deep clone of the object.
*/
-utils.clone = function(obj) {
- if(!obj || typeof obj == 'function' || utils.isDate(obj) || typeof obj != 'object') {
+utils.clone = function (obj) {
+ if (!obj || typeof obj === 'function' || utils.isDate(obj) || typeof obj !== 'object') {
return obj;
}
var retVal, i;
- if(utils.isArray(obj)){
+ if (utils.isArray(obj)) {
retVal = [];
- for(i = 0; i < obj.length; ++i){
+ for (i = 0; i < obj.length; ++i) {
retVal.push(utils.clone(obj[i]));
}
return retVal;
}
retVal = {};
- for(i in obj){
+ for (i in obj) {
// https://issues.apache.org/jira/browse/CB-11522 'unknown' type may be returned in
// custom protocol activation case on Windows Phone 8.1 causing "No such interface supported" exception
// on cloning.
- if((!(i in retVal) || retVal[i] != obj[i]) && typeof obj[i] != 'undefined' && typeof obj[i] != 'unknown') {
+ if ((!(i in retVal) || retVal[i] !== obj[i]) && typeof obj[i] !== 'undefined' && typeof obj[i] !== 'unknown') { // eslint-disable-line valid-typeof
retVal[i] = utils.clone(obj[i]);
}
}
@@ -2135,20 +2119,20 @@ utils.clone = function(obj) {
/**
* Returns a wrapped version of the function
*/
-utils.close = function(context, func, params) {
- return function() {
+utils.close = function (context, func, params) {
+ return function () {
var args = params || arguments;
return func.apply(context, args);
};
};
-//------------------------------------------------------------------------------
-function UUIDcreatePart(length) {
- var uuidpart = "";
- for (var i=0; i<length; i++) {
+// ------------------------------------------------------------------------------
+function UUIDcreatePart (length) {
+ var uuidpart = '';
+ for (var i = 0; i < length; i++) {
var uuidchar = parseInt((Math.random() * 256), 10).toString(16);
- if (uuidchar.length == 1) {
- uuidchar = "0" + uuidchar;
+ if (uuidchar.length === 1) {
+ uuidchar = '0' + uuidchar;
}
uuidpart += uuidchar;
}
@@ -2158,7 +2142,7 @@ function UUIDcreatePart(length) {
/**
* Create a UUID
*/
-utils.createUUID = function() {
+utils.createUUID = function () {
return UUIDcreatePart(4) + '-' +
UUIDcreatePart(2) + '-' +
UUIDcreatePart(2) + '-' +
@@ -2166,16 +2150,15 @@ utils.createUUID = function() {
UUIDcreatePart(6);
};
-
/**
* Extends a child object from a parent object using classical inheritance
* pattern.
*/
-utils.extend = (function() {
+utils.extend = (function () {
// proxy used to establish prototype chain
- var F = function() {};
+ var F = function () {};
// extend Child from Parent
- return function(Child, Parent) {
+ return function (Child, Parent) {
F.prototype = Parent.prototype;
Child.prototype = new F();
@@ -2187,7 +2170,7 @@ utils.extend = (function() {
/**
* Alerts a message in any available way: alert or console.log.
*/
-utils.alert = function(msg) {
+utils.alert = function (msg) {
if (window.alert) {
window.alert(msg);
} else if (console && console.log) {
@@ -2195,10 +2178,6 @@ utils.alert = function(msg) {
}
};
-
-
-
-
});
window.cordova = require('cordova');
@@ -2206,4 +2185,4 @@ window.cordova = require('cordova');
require('cordova/init');
-})();
+})();
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org