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 2013/06/04 22:52:57 UTC
[01/13] js commit: 2.6.0rc1
Updated Branches:
refs/heads/2.8.x eedbf67bf -> 6208c9593
Updated Tags: refs/tags/2.8.0 [created] 6208c9593
2.6.0rc1
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/47593b2b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/47593b2b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/47593b2b
Branch: refs/heads/2.8.x
Commit: 47593b2bc1dba9bf46545b1da24577f937966e12
Parents: bbf1562
Author: Fil Maj <ma...@gmail.com>
Authored: Thu Mar 21 10:06:28 2013 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Thu Mar 21 10:06:28 2013 -0700
----------------------------------------------------------------------
VERSION | 2 +-
lib/bada/plugin/bada/device.js | 2 +-
lib/blackberry/plugin/air/device.js | 2 +-
lib/blackberry/plugin/qnx/device.js | 2 +-
lib/tizen/plugin/tizen/Device.js | 2 +-
lib/windows8/plugin/windows8/DeviceProxy.js | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/47593b2b/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 437459c..f47de85 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.0
+2.6.0rc1
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/47593b2b/lib/bada/plugin/bada/device.js
----------------------------------------------------------------------
diff --git a/lib/bada/plugin/bada/device.js b/lib/bada/plugin/bada/device.js
index c2db705..da28e3a 100644
--- a/lib/bada/plugin/bada/device.js
+++ b/lib/bada/plugin/bada/device.js
@@ -69,7 +69,7 @@ Device.prototype.getDeviceInfo = function(success, fail, args) {
me.platform = os_vendor + " " + os_name;
me.version = os_version;
me.uuid = uuid;
- me.cordova = "2.5.0";
+ me.cordova = "2.6.0rc1";
success(me);
}
};
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/47593b2b/lib/blackberry/plugin/air/device.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/air/device.js b/lib/blackberry/plugin/air/device.js
index 4050a0a..2ddc4d4 100644
--- a/lib/blackberry/plugin/air/device.js
+++ b/lib/blackberry/plugin/air/device.js
@@ -35,7 +35,7 @@ module.exports = {
model: "PlayBook",
name: "PlayBook", // deprecated: please use device.model
uuid: info.uuid,
- cordova: "2.5.0"
+ cordova: "2.6.0rc1"
});
}),
request = new blackberry.transport.RemoteFunctionCall("org/apache/cordova/getDeviceInfo");
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/47593b2b/lib/blackberry/plugin/qnx/device.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/qnx/device.js b/lib/blackberry/plugin/qnx/device.js
index 7c44ddd..9277863 100644
--- a/lib/blackberry/plugin/qnx/device.js
+++ b/lib/blackberry/plugin/qnx/device.js
@@ -33,7 +33,7 @@ module.exports = {
model: "Dev Alpha",
name: "Dev Alpha", // deprecated: please use device.model
uuid: blackberry.identity.uuid,
- cordova: "2.5.0"
+ cordova: "2.6.0rc1"
});
return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "Device info returned" };
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/47593b2b/lib/tizen/plugin/tizen/Device.js
----------------------------------------------------------------------
diff --git a/lib/tizen/plugin/tizen/Device.js b/lib/tizen/plugin/tizen/Device.js
index 8e5f83a..62de8ac 100644
--- a/lib/tizen/plugin/tizen/Device.js
+++ b/lib/tizen/plugin/tizen/Device.js
@@ -29,7 +29,7 @@ function Device() {
this.version = null;
this.uuid = null;
this.name = null;
- this.cordova = "2.5.0";
+ this.cordova = "2.6.0rc1";
this.platform = "Tizen";
var me = this;
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/47593b2b/lib/windows8/plugin/windows8/DeviceProxy.js
----------------------------------------------------------------------
diff --git a/lib/windows8/plugin/windows8/DeviceProxy.js b/lib/windows8/plugin/windows8/DeviceProxy.js
index 7826c72..6df00d2 100644
--- a/lib/windows8/plugin/windows8/DeviceProxy.js
+++ b/lib/windows8/plugin/windows8/DeviceProxy.js
@@ -50,7 +50,7 @@ module.exports = {
}
setTimeout(function () {
- win({ platform: "windows8", version: "8", name: name, uuid: deviceId, cordova: "2.5.0" });
+ win({ platform: "windows8", version: "8", name: name, uuid: deviceId, cordova: "2.6.0rc1" });
}, 0);
}
[09/13] js commit: [all] [CB-2200] Remove deprecated device.name
field.
Posted by bo...@apache.org.
[all] [CB-2200] Remove deprecated device.name field.
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/0fa84989
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/0fa84989
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/0fa84989
Branch: refs/heads/2.8.x
Commit: 0fa8498995bda9c85495ff71321b03a9603ea1d3
Parents: 76065a1
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed May 29 10:56:23 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed May 29 10:56:23 2013 -0400
----------------------------------------------------------------------
lib/common/plugin/device.js | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/0fa84989/lib/common/plugin/device.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/device.js b/lib/common/plugin/device.js
index 73e9de9..2b377d8 100644
--- a/lib/common/plugin/device.js
+++ b/lib/common/plugin/device.js
@@ -36,7 +36,6 @@ function Device() {
this.available = false;
this.platform = null;
this.version = null;
- this.name = null;
this.uuid = null;
this.cordova = null;
this.model = null;
@@ -52,7 +51,6 @@ function Device() {
me.available = true;
me.platform = info.platform;
me.version = info.version;
- me.name = info.name;
me.uuid = info.uuid;
me.cordova = buildLabel;
me.model = info.model;
[07/13] js commit: Add a check for cordova.js being loaded multiple
times
Posted by bo...@apache.org.
Add a check for cordova.js being loaded multiple times
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/55de99f0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/55de99f0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/55de99f0
Branch: refs/heads/2.8.x
Commit: 55de99f0481b7034d4c475e6186c67af6da36d25
Parents: 0bca505
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue May 28 14:41:31 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue May 28 14:41:31 2013 -0400
----------------------------------------------------------------------
lib/scripts/bootstrap.js | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/55de99f0/lib/scripts/bootstrap.js
----------------------------------------------------------------------
diff --git a/lib/scripts/bootstrap.js b/lib/scripts/bootstrap.js
index 31979fa..47c3179 100644
--- a/lib/scripts/bootstrap.js
+++ b/lib/scripts/bootstrap.js
@@ -20,6 +20,11 @@
*/
(function (context) {
+ if (context._cordovaJsLoaded) {
+ throw new Error('cordova.js included multiple times.');
+ }
+ context._cordovaJsLoaded = true;
+
var channel = require('cordova/channel');
var platformInitChannelsArray = [channel.onNativeReady, channel.onPluginsReady];
[11/13] js commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-js
Posted by bo...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/4de48d21
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/4de48d21
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/4de48d21
Branch: refs/heads/2.8.x
Commit: 4de48d210c1c366f5b79601e77421f6b30e5dd63
Parents: 1fe978d 11bdd38
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Jun 4 13:15:58 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Jun 4 13:15:58 2013 -0700
----------------------------------------------------------------------
.reviewboardrc | 8 +
Jakefile | 31 +-
README.md | 20 +
build/packager.js | 5 +
lib/android/plugin/android/nativeapiprovider.js | 19 +
lib/android/plugin/android/promptbasednativeapi.js | 19 +
lib/blackberry/platform.js | 5 +-
lib/blackberry/plugin/qnx/InAppBrowser.js | 86 --
lib/blackberry/plugin/qnx/battery.js | 40 -
lib/blackberry/plugin/qnx/camera.js | 32 -
lib/blackberry/plugin/qnx/capture.js | 76 --
lib/blackberry/plugin/qnx/compass.js | 162 ----
lib/blackberry/plugin/qnx/device.js | 41 -
lib/blackberry/plugin/qnx/file.js | 424 ----------
lib/blackberry/plugin/qnx/fileTransfer.js | 205 -----
lib/blackberry/plugin/qnx/magnetometer.js | 45 -
lib/blackberry/plugin/qnx/manager.js | 60 --
lib/blackberry/plugin/qnx/network.js | 28 -
lib/blackberry/plugin/qnx/platform.js | 44 -
lib/blackberry10/exec.js | 49 ++
lib/blackberry10/platform.js | 47 +
lib/blackberry10/plugin/DirectoryEntry.js | 57 ++
lib/blackberry10/plugin/DirectoryReader.js | 47 +
lib/blackberry10/plugin/Entry.js | 112 +++
lib/blackberry10/plugin/FileEntry.js | 47 +
lib/blackberry10/plugin/FileReader.js | 90 ++
lib/blackberry10/plugin/FileSystem.js | 27 +
lib/blackberry10/plugin/FileTransfer.js | 187 +++++
lib/blackberry10/plugin/FileWriter.js | 120 +++
.../plugin/blackberry10/InAppBrowser.js | 86 ++
lib/blackberry10/plugin/blackberry10/capture.js | 76 ++
lib/blackberry10/plugin/blackberry10/compass.js | 162 ++++
lib/blackberry10/plugin/blackberry10/event.js | 102 +++
lib/blackberry10/plugin/blackberry10/exception.js | 74 ++
.../plugin/blackberry10/fileTransfer.js | 201 +++++
lib/blackberry10/plugin/blackberry10/fileUtils.js | 47 +
.../plugin/blackberry10/magnetometer.js | 45 +
lib/blackberry10/plugin/blackberry10/media.js | 189 +++++
lib/blackberry10/plugin/blackberry10/utils.js | 556 ++++++++++++
lib/blackberry10/plugin/blackberry10/vibrate.js | 31 +
lib/blackberry10/plugin/requestFileSystem.js | 38 +
.../plugin/resolveLocalFileSystemURI.js | 55 ++
lib/common/plugin/FileReader.js | 6 +-
lib/common/plugin/device.js | 2 -
lib/common/plugin/notification.js | 2 +-
lib/scripts/bootstrap-blackberry.js | 20 +-
lib/scripts/bootstrap-blackberry10.js | 136 +++
lib/scripts/bootstrap.js | 5 +
lib/scripts/plugin_loader.js | 23 +-
lib/scripts/require.js | 21 +-
lib/tizen/exec.js | 57 ++-
lib/tizen/platform.js | 15 +
lib/tizen/plugin/tizen/Accelerometer.js | 24 +-
lib/tizen/plugin/tizen/Battery.js | 19 +-
lib/tizen/plugin/tizen/Camera.js | 80 ++-
lib/tizen/plugin/tizen/Compass.js | 32 +-
lib/tizen/plugin/tizen/Contact.js | 152 +++--
lib/tizen/plugin/tizen/ContactUtils.js | 118 +--
lib/tizen/plugin/tizen/Device.js | 45 +-
lib/tizen/plugin/tizen/File.js | 651 ++++++++++-----
lib/tizen/plugin/tizen/FileTransfer.js | 193 +++--
lib/tizen/plugin/tizen/Media.js | 79 ++-
lib/tizen/plugin/tizen/NetworkStatus.js | 46 +-
lib/tizen/plugin/tizen/Notification.js | 23 +
test/blackberry/qnx/test.battery.js | 72 --
test/blackberry/qnx/test.camera.js | 59 --
test/blackberry/qnx/test.capture.js | 222 -----
test/blackberry/qnx/test.compass.js | 61 --
test/blackberry/qnx/test.device.js | 48 --
test/blackberry/qnx/test.fileTransfer.js | 85 --
test/blackberry/qnx/test.magnetometer.js | 80 --
test/blackberry/qnx/test.manager.js | 56 --
test/blackberry/qnx/test.network.js | 39 -
test/blackberry/qnx/test.platform.js | 123 ---
test/blackberry/test.exec.js | 16 +-
test/blackberry/test.platform.js | 25 +-
test/blackberry10/test.capture.js | 222 +++++
test/blackberry10/test.compass.js | 61 ++
test/blackberry10/test.event.js | 188 +++++
test/blackberry10/test.magnetometer.js | 80 ++
test/runner.js | 2 +-
test/test.require.js | 2 +-
82 files changed, 4315 insertions(+), 2670 deletions(-)
----------------------------------------------------------------------
[05/13] js commit: [CB-3415][BlackBerry10] FileTransfer core plugin
Posted by bo...@apache.org.
[CB-3415][BlackBerry10] FileTransfer core plugin
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/b3bb0aae
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/b3bb0aae
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/b3bb0aae
Branch: refs/heads/2.8.x
Commit: b3bb0aae392dc8ffe9886200f26dde2ca04bf5e5
Parents: 5485a4c
Author: Hasan Ahmad <ha...@blackberry.com>
Authored: Tue May 7 14:22:23 2013 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Tue May 21 16:13:33 2013 -0400
----------------------------------------------------------------------
lib/blackberry10/plugin/FileTransfer.js | 187 +++++++++++++++
.../plugin/blackberry10/fileTransfer.js | 51 ++--
2 files changed, 212 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/b3bb0aae/lib/blackberry10/plugin/FileTransfer.js
----------------------------------------------------------------------
diff --git a/lib/blackberry10/plugin/FileTransfer.js b/lib/blackberry10/plugin/FileTransfer.js
new file mode 100644
index 0000000..09b9d5f
--- /dev/null
+++ b/lib/blackberry10/plugin/FileTransfer.js
@@ -0,0 +1,187 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+var argscheck = require('cordova/argscheck'),
+ exec = require('cordova/exec'),
+ FileTransferError = require('cordova/plugin/FileTransferError');
+
+function getBasicAuthHeader(urlString) {
+ var header = null;
+
+ if (window.btoa) {
+ // parse the url using the Location object
+ var url = document.createElement('a');
+ url.href = urlString;
+
+ var credentials = null;
+ var protocol = url.protocol + "//";
+ var origin = protocol + url.host;
+
+ // check whether there are the username:password credentials in the url
+ if (url.href.indexOf(origin) !== 0) { // credentials found
+ var atIndex = url.href.indexOf("@");
+ credentials = url.href.substring(protocol.length, atIndex);
+ }
+
+ if (credentials) {
+ var authHeader = "Authorization";
+ var authHeaderValue = "Basic " + window.btoa(credentials);
+
+ header = {
+ name : authHeader,
+ value : authHeaderValue
+ };
+ }
+ }
+
+ return header;
+}
+
+var idCounter = 0;
+
+/**
+ * FileTransfer uploads a file to a remote server.
+ * @constructor
+ */
+var FileTransfer = function() {
+ this._id = ++idCounter;
+ this.onprogress = null; // optional callback
+};
+
+/**
+* Given an absolute file path, uploads a file on the device to a remote server
+* using a multipart HTTP request.
+* @param filePath {String} Full path of the file on the device
+* @param server {String} URL of the server to receive the file
+* @param successCallback (Function} Callback to be invoked when upload has completed
+* @param errorCallback {Function} Callback to be invoked upon error
+* @param options {FileUploadOptions} Optional parameters such as file name and mimetype
+* @param trustAllHosts {Boolean} Optional trust all hosts (e.g. for self-signed certs), defaults to false
+*/
+FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, trustAllHosts) {
+ argscheck.checkArgs('ssFFO*', 'FileTransfer.upload', arguments);
+ // check for options
+ var fileKey = null;
+ var fileName = null;
+ var mimeType = null;
+ var params = null;
+ var chunkedMode = true;
+ var headers = null;
+ var httpMethod = null;
+ var basicAuthHeader = getBasicAuthHeader(server);
+ if (basicAuthHeader) {
+ options = options || {};
+ options.headers = options.headers || {};
+ options.headers[basicAuthHeader.name] = basicAuthHeader.value;
+ }
+
+ if (options) {
+ fileKey = options.fileKey;
+ fileName = options.fileName;
+ mimeType = options.mimeType;
+ headers = options.headers;
+ httpMethod = options.httpMethod || "POST";
+ if (httpMethod.toUpperCase() == "PUT"){
+ httpMethod = "PUT";
+ } else {
+ httpMethod = "POST";
+ }
+ if (options.chunkedMode !== null || typeof options.chunkedMode != "undefined") {
+ chunkedMode = options.chunkedMode;
+ }
+ if (options.params) {
+ params = options.params;
+ }
+ else {
+ params = {};
+ }
+ }
+
+ var fail = errorCallback && function(e) {
+ var error = new FileTransferError(e.code, e.source, e.target, e.http_status, e.body);
+ errorCallback(error);
+ };
+
+ var self = this;
+ var win = function(result) {
+ if (typeof result.lengthComputable != "undefined") {
+ if (self.onprogress) {
+ self.onprogress(result);
+ }
+ } else {
+ successCallback && successCallback(result);
+ }
+ };
+ exec(win, fail, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params, trustAllHosts, chunkedMode, headers, this._id, httpMethod]);
+};
+
+/**
+ * Downloads a file form a given URL and saves it to the specified directory.
+ * @param source {String} URL of the server to receive the file
+ * @param target {String} Full path of the file on the device
+ * @param successCallback (Function} Callback to be invoked when upload has completed
+ * @param errorCallback {Function} Callback to be invoked upon error
+ * @param trustAllHosts {Boolean} Optional trust all hosts (e.g. for self-signed certs), defaults to false
+ * @param options {FileDownloadOptions} Optional parameters such as headers
+ */
+FileTransfer.prototype.download = function(source, target, successCallback, errorCallback, trustAllHosts, options) {
+ argscheck.checkArgs('ssFF*', 'FileTransfer.download', arguments);
+ var self = this;
+
+ var basicAuthHeader = getBasicAuthHeader(source);
+ if (basicAuthHeader) {
+ options = options || {};
+ options.headers = options.headers || {};
+ options.headers[basicAuthHeader.name] = basicAuthHeader.value;
+ }
+
+ var headers = null;
+ if (options) {
+ headers = options.headers || null;
+ }
+
+ var win = function(result) {
+ if (typeof result.lengthComputable != "undefined") {
+ if (self.onprogress) {
+ return self.onprogress(result);
+ }
+ } else if (successCallback) {
+ successCallback(result);
+ }
+ };
+
+ var fail = errorCallback && function(e) {
+ var error = new FileTransferError(e.code, e.source, e.target, e.http_status, e.body);
+ errorCallback(error);
+ };
+
+ exec(win, fail, 'FileTransfer', 'download', [source, target, trustAllHosts, this._id, headers]);
+};
+
+/**
+ * Aborts the ongoing file transfer on this object. The original error
+ * callback for the file transfer will be called if necessary.
+ */
+FileTransfer.prototype.abort = function() {
+ exec(null, null, 'FileTransfer', 'abort', [this._id]);
+};
+
+module.exports = FileTransfer;
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/b3bb0aae/lib/blackberry10/plugin/blackberry10/fileTransfer.js
----------------------------------------------------------------------
diff --git a/lib/blackberry10/plugin/blackberry10/fileTransfer.js b/lib/blackberry10/plugin/blackberry10/fileTransfer.js
index c225433..b4756b3 100644
--- a/lib/blackberry10/plugin/blackberry10/fileTransfer.js
+++ b/lib/blackberry10/plugin/blackberry10/fileTransfer.js
@@ -21,12 +21,11 @@
/*global Blob:false */
var cordova = require('cordova'),
- ProgressEvent = require('cordova/plugin/ProgressEvent'),
nativeResolveLocalFileSystemURI = function(uri, success, fail) {
if (uri.substring(0,11) !== "filesystem:") {
uri = "filesystem:" + uri;
}
- window.webkitResolveLocalFileSystemURL(uri, success, fail);
+ resolveLocalFileSystemURI(uri, success, fail);
},
xhr;
@@ -40,11 +39,6 @@ function getFileName(filePath) {
return filePath.substring(pos + 1);
}
-function cleanUpPath(filePath) {
- var pos = filePath.lastIndexOf('/');
- return filePath.substring(0, pos) + filePath.substring(pos + 1, filePath.length);
-}
-
function checkURL(url) {
return url.indexOf(' ') === -1 ? true : false;
}
@@ -66,7 +60,7 @@ module.exports = {
headers = args[8];
if (!checkURL(server)) {
- fail(new window.FileTransferError(window.FileTransferError.INVALID_URL_ERR));
+ fail(new FileTransferError(FileTransferError.INVALID_URL_ERR, server, filePath));
}
nativeResolveLocalFileSystemURI(filePath, function(entry) {
@@ -84,23 +78,23 @@ module.exports = {
xhr = new XMLHttpRequest();
xhr.open("POST", server);
xhr.onload = function(evt) {
- if (xhr.status == 200) {
- var result = new window.FileUploadResult();
+ if (xhr.status === 200) {
+ var result = new FileUploadResult();
result.bytesSent = file.size;
result.responseCode = xhr.status;
result.response = xhr.response;
win(result);
- } else if (xhr.status == 404) {
- fail(new window.FileTransferError(window.FileTransferError.INVALID_URL_ERR, server, filePath, xhr.status));
+ } else if (xhr.status === 404) {
+ fail(new FileTransferError(FileTransferError.INVALID_URL_ERR, server, filePath, xhr.status, xhr.response));
} else {
- fail(new window.FileTransferError(window.FileTransferError.CONNECTION_ERR, server, filePath, xhr.status));
+ fail(new FileTransferError(FileTransferError.CONNECTION_ERR, server, filePath, xhr.status, xhr.response));
}
};
xhr.ontimeout = function(evt) {
- fail(new window.FileTransferError(window.FileTransferError.CONNECTION_ERR, server, filePath, xhr.status));
+ fail(new FileTransferError(FileTransferError.CONNECTION_ERR, server, filePath, xhr.status, xhr.response));
};
xhr.onerror = function () {
- fail(new window.FileTransferError(window.FileTransferError.CONNECTION_ERR, server, filePath, this.status));
+ fail(new FileTransferError(FileTransferError.CONNECTION_ERR, server, filePath, this.status, xhr.response));
};
xhr.onprogress = function (evt) {
win(evt);
@@ -130,10 +124,10 @@ module.exports = {
end = start + bytesPerChunk;
}
}, function(error) {
- fail(new window.FileTransferError(window.FileTransferError.FILE_NOT_FOUND_ERR));
+ fail(new FileTransferError(FileTransferError.FILE_NOT_FOUND_ERR, server, filePath));
});
}, function(error) {
- fail(new window.FileTransferError(window.FileTransferError.FILE_NOT_FOUND_ERR));
+ fail(new FileTransferError(FileTransferError.FILE_NOT_FOUND_ERR, server, filePath));
});
return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
@@ -141,11 +135,12 @@ module.exports = {
download: function (args, win, fail) {
var source = args[0],
- target = cleanUpPath(args[1]),
+ target = args[1],
+ headers = args[4],
fileWriter;
if (!checkURL(source)) {
- fail(new window.FileTransferError(window.FileTransferError.INVALID_URL_ERR));
+ fail(new FileTransferError(FileTransferError.INVALID_URL_ERR, source, target));
}
xhr = new XMLHttpRequest();
@@ -155,7 +150,7 @@ module.exports = {
fileWriter = writer;
fileWriter.onwriteend = function (evt) {
if (!evt.target.error) {
- win(new window.FileEntry(entry.name, entry.toURL()));
+ win(entry);
} else {
fail(evt.target.error);
}
@@ -170,7 +165,7 @@ module.exports = {
}
xhr.onerror = function (e) {
- fail(new window.FileTransferError(window.FileTransferError.CONNECTION_ERR, source, target, xhr.status));
+ fail(new FileTransferError(FileTransferError.CONNECTION_ERR, source, target, xhr.status, xhr.response));
};
xhr.onload = function () {
@@ -178,15 +173,15 @@ module.exports = {
if (xhr.status === 200 && xhr.response) {
nativeResolveLocalFileSystemURI(getParentPath(target), function (dir) {
dir.getFile(getFileName(target), {create: true}, writeFile, function (error) {
- fail(new window.FileTransferError(window.FileTransferError.FILE_NOT_FOUND_ERR));
+ fail(new FileTransferError(FileTransferError.FILE_NOT_FOUND_ERR, source, target, xhr.status, xhr.response));
});
}, function (error) {
- fail(new window.FileTransferError(window.FileTransferError.FILE_NOT_FOUND_ERR));
+ fail(new FileTransferError(FileTransferError.FILE_NOT_FOUND_ERR, source, target, xhr.status, xhr.response));
});
} else if (xhr.status === 404) {
- fail(new window.FileTransferError(window.FileTransferError.INVALID_URL_ERR, source, target, xhr.status));
+ fail(new FileTransferError(FileTransferError.INVALID_URL_ERR, source, target, xhr.status, xhr.response));
} else {
- fail(new window.FileTransferError(window.FileTransferError.CONNECTION_ERR, source, target, xhr.status));
+ fail(new FileTransferError(FileTransferError.CONNECTION_ERR, source, target, xhr.status, xhr.response));
}
}
};
@@ -194,8 +189,12 @@ module.exports = {
win(evt);
};
- xhr.responseType = "blob";
xhr.open("GET", source, true);
+ for (var header in headers) {
+ if (headers.hasOwnProperty(header)) {
+ xhr.setRequestHeader(header, headers[header]);
+ }
+ }
xhr.send();
return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
}
[10/13] js commit: CB-3409 removed deprecated
FileReader.readAsText(string) handling
Posted by bo...@apache.org.
CB-3409 removed deprecated FileReader.readAsText(string) handling
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/11bdd389
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/11bdd389
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/11bdd389
Branch: refs/heads/2.8.x
Commit: 11bdd3899eb4344a18dcbf65a938c67b87cd7950
Parents: 0fa8498
Author: David Kemp <dr...@chromium.org>
Authored: Wed May 22 10:00:00 2013 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Wed May 29 15:36:14 2013 -0400
----------------------------------------------------------------------
lib/common/plugin/FileReader.js | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/11bdd389/lib/common/plugin/FileReader.js
----------------------------------------------------------------------
diff --git a/lib/common/plugin/FileReader.js b/lib/common/plugin/FileReader.js
index 115f8fa..78c70cb 100644
--- a/lib/common/plugin/FileReader.js
+++ b/lib/common/plugin/FileReader.js
@@ -84,11 +84,7 @@ function initRead(reader, file) {
reader._error = null;
reader._readyState = FileReader.LOADING;
- if (typeof file == 'string') {
- // Deprecated in Cordova 2.4.
- console.warn('Using a string argument with FileReader.readAs functions is deprecated.');
- reader._fileName = file;
- } else if (typeof file.fullPath == 'string') {
+ if (typeof file.fullPath == 'string') {
reader._fileName = file.fullPath;
} else {
reader._fileName = '';
[08/13] js commit: Add missing license headers (found by RAT)
Posted by bo...@apache.org.
Add missing license headers (found by RAT)
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/76065a14
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/76065a14
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/76065a14
Branch: refs/heads/2.8.x
Commit: 76065a142e1eb0c28cfd57a38ce46f0613961918
Parents: 55de99f0
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue May 28 16:32:57 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue May 28 16:32:57 2013 -0400
----------------------------------------------------------------------
README.md | 20 +++++++++++++++
lib/android/plugin/android/nativeapiprovider.js | 19 ++++++++++++++
lib/android/plugin/android/promptbasednativeapi.js | 19 ++++++++++++++
3 files changed, 58 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/76065a14/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index f3a3d47..994f05c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,23 @@
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+-->
A unified JavaScript layer for [Apache Cordova](http://incubator.apache.org/projects/callback.html) projects.
# Project Structure
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/76065a14/lib/android/plugin/android/nativeapiprovider.js
----------------------------------------------------------------------
diff --git a/lib/android/plugin/android/nativeapiprovider.js b/lib/android/plugin/android/nativeapiprovider.js
index b8b4b59..50fd8ad 100644
--- a/lib/android/plugin/android/nativeapiprovider.js
+++ b/lib/android/plugin/android/nativeapiprovider.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+
/**
* Exports the ExposedJsApi.java object if available, otherwise exports the PromptBasedNativeApi.
*/
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/76065a14/lib/android/plugin/android/promptbasednativeapi.js
----------------------------------------------------------------------
diff --git a/lib/android/plugin/android/promptbasednativeapi.js b/lib/android/plugin/android/promptbasednativeapi.js
index e89084d..a665135 100644
--- a/lib/android/plugin/android/promptbasednativeapi.js
+++ b/lib/android/plugin/android/promptbasednativeapi.js
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+
/**
* Implements the API of ExposedJsApi.java, but uses prompt() to communicate.
* This is used only on the 2.3 simulator, where addJavascriptInterface() is broken.
[06/13] js commit: [CB-3434] [BlackBerry10] Route online/offline
events from document to window
Posted by bo...@apache.org.
[CB-3434] [BlackBerry10] Route online/offline events from document to window
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/0bca5053
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/0bca5053
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/0bca5053
Branch: refs/heads/2.8.x
Commit: 0bca505379680e6dd3b7ef3ee9b8d555ffb3af0b
Parents: b3bb0aa
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Tue May 21 14:50:55 2013 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Tue May 21 16:14:49 2013 -0400
----------------------------------------------------------------------
lib/blackberry10/platform.js | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/0bca5053/lib/blackberry10/platform.js
----------------------------------------------------------------------
diff --git a/lib/blackberry10/platform.js b/lib/blackberry10/platform.js
index 3b29584..0b15ca1 100644
--- a/lib/blackberry10/platform.js
+++ b/lib/blackberry10/platform.js
@@ -23,7 +23,8 @@ module.exports = {
id: "blackberry10",
initialize: function() {
var modulemapper = require('cordova/modulemapper'),
- cordova = require('cordova');
+ cordova = require('cordova'),
+ addDocumentEventListener = document.addEventListener;
modulemapper.loadMatchingModules(/cordova.*\/symbols$/);
modulemapper.loadMatchingModules(new RegExp('cordova/blackberry10/.*bbsymbols$'));
@@ -33,5 +34,14 @@ module.exports = {
modulemapper.merges('cordova/plugin/blackberry10/compass', 'navigator.compass');
modulemapper.mapModules(window);
+
+ //override to pass online/offline events to window
+ document.addEventListener = function (type) {
+ if (type === "online" || type === "offline") {
+ window.addEventListener.apply(window, arguments);
+ } else {
+ addDocumentEventListener.apply(document, arguments);
+ }
+ }
}
};
[03/13] js commit: Fixing merge conflicts from not updating VERSION
Posted by bo...@apache.org.
Fixing merge conflicts from not updating VERSION
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/47704596
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/47704596
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/47704596
Branch: refs/heads/2.8.x
Commit: 477045961d90ab2c9e1479cb60dbe991b26142fe
Parents: da1caec 360bd3e
Author: Joe Bowser <bo...@apache.org>
Authored: Fri Apr 19 17:54:54 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri Apr 19 17:54:54 2013 -0700
----------------------------------------------------------------------
VERSION | 2 +-
lib/bada/plugin/bada/device.js | 2 +-
lib/blackberry/plugin/air/device.js | 2 +-
lib/blackberry/plugin/qnx/device.js | 2 +-
lib/tizen/plugin/tizen/Device.js | 2 +-
lib/windows8/plugin/windows8/DeviceProxy.js | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[02/13] js commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-js
Posted by bo...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/da1caec9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/da1caec9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/da1caec9
Branch: refs/heads/2.8.x
Commit: da1caec9caf2c52197319289d141960bc0659977
Parents: 47593b2 c524f9f
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Apr 18 11:46:41 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Apr 18 11:46:41 2013 -0700
----------------------------------------------------------------------
lib/android/exec.js | 53 ++--
lib/blackberry/plugin/qnx/file.js | 1 +
lib/blackberry/plugin/qnx/fileTransfer.js | 1 +
lib/common/channel.js | 1 +
lib/common/plugin/FileReader.js | 2 +-
lib/common/plugin/FileTransfer.js | 37 +--
lib/common/plugin/FileUploadOptions.js | 3 +-
lib/common/plugin/InAppBrowser.js | 28 ++
lib/common/plugin/console-via-logger.js | 2 +-
lib/common/plugin/logger.js | 92 +++++-
lib/common/plugin/notification.js | 6 +-
lib/common/utils.js | 76 -----
lib/cordova.js | 4 +
lib/ios/plugin/ios/console.js | 93 ------
lib/ios/plugin/ios/console/symbols.js | 23 --
lib/ios/plugin/ios/logger/symbols.js | 24 ++
lib/osx/exec.js | 6 +-
lib/scripts/bootstrap-android.js | 22 ++
lib/scripts/bootstrap-ios.js | 22 ++
lib/scripts/bootstrap.js | 42 ++-
lib/scripts/plugin_loader.js | 29 +-
lib/tizen/plugin/tizen/ContactUtils.js | 7 +-
lib/webos/platform.js | 2 +
lib/windows8/platform.js | 46 +---
lib/windows8/plugin/windows8/NetworkStatusProxy.js | 4 +
lib/windows8/plugin/windows8/console/symbols.js | 24 ++
.../plugin/windows8/notification/plugininit.js | 23 ++
lib/windowsphone/platform.js | 33 +--
lib/windowsphone/plugin/file/symbols.js | 1 -
lib/windowsphone/plugin/inappbrowser/symbols.js | 24 ++
lib/windowsphone/plugin/windowsphone/DOMStorage.js | 200 -----------
.../plugin/windowsphone/DOMStorage/plugininit.js | 200 +++++++++++
lib/windowsphone/plugin/windowsphone/XHRPatch.js | 255 ---------------
.../plugin/windowsphone/XHRPatch/plugininit.js | 255 +++++++++++++++
.../plugin/windowsphone/console/symbols.js | 25 ++
.../plugin/windowsphone/notification/plugininit.js | 23 ++
test/android/test.exec.js | 53 ++--
test/test.logger.js | 132 ++++++++
test/test.utils.js | 116 -------
39 files changed, 1037 insertions(+), 953 deletions(-)
----------------------------------------------------------------------
[13/13] js commit: Incrementing version
Posted by bo...@apache.org.
Incrementing version
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/6208c959
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/6208c959
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/6208c959
Branch: refs/heads/2.8.x
Commit: 6208c9593a0a472f3e04168c9d237a3121329c1a
Parents: 3efcf75
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Jun 4 13:45:04 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Jun 4 13:45:04 2013 -0700
----------------------------------------------------------------------
VERSION | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/6208c959/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 1277c83..834f262 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.8.0rc1
+2.8.0
[12/13] js commit: Merge branch '2.8.x' of
https://git-wip-us.apache.org/repos/asf/cordova-js into 2.8.x
Posted by bo...@apache.org.
Merge branch '2.8.x' of https://git-wip-us.apache.org/repos/asf/cordova-js into 2.8.x
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/3efcf75c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/3efcf75c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/3efcf75c
Branch: refs/heads/2.8.x
Commit: 3efcf75c4d8d83dafc87e50aa84f0754e72eeec3
Parents: 4de48d2 eedbf67
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Jun 4 13:42:59 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Jun 4 13:42:59 2013 -0700
----------------------------------------------------------------------
VERSION | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
[04/13] js commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-js
Posted by bo...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/1fe978d5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/1fe978d5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/1fe978d5
Branch: refs/heads/2.8.x
Commit: 1fe978d58c93c1db30d0a3b310e32a49016e81c5
Parents: 4770459 a86559a
Author: Joe Bowser <bo...@apache.org>
Authored: Mon May 13 15:31:26 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon May 13 15:31:26 2013 -0700
----------------------------------------------------------------------
.jshintrc | 2 +-
Jakefile | 64 +++++----------
VERSION | 2 +-
build/packager.js | 18 ++--
lib/bada/plugin/bada/device.js | 2 +-
lib/blackberry/plugin/air/device.js | 2 +-
lib/blackberry/plugin/qnx/device.js | 2 +-
lib/common/plugin/CaptureAudioOptions.js | 2 -
lib/common/plugin/CaptureImageOptions.js | 2 -
lib/common/plugin/CaptureVideoOptions.js | 2 -
lib/common/plugin/device.js | 6 +-
lib/common/plugin/logger.js | 48 +++++++----
lib/common/plugin/notification.js | 6 +-
lib/firefoxos/plugin/firefoxos/device.js | 2 +-
lib/ios/exec.js | 18 +++-
lib/ios/plugin/ios/logger/plugininit.js | 2 +-
lib/scripts/plugin_loader.js | 36 +++++----
lib/tizen/plugin/tizen/Device.js | 2 +-
lib/windows8/platform.js | 4 +-
lib/windows8/plugin/windows8/DeviceProxy.js | 2 +-
lib/windowsphone/plugin/file/symbols.js | 2 -
.../plugin/windowsphone/notification/plugininit.js | 23 -----
test/test.notification.js | 6 +-
23 files changed, 119 insertions(+), 136 deletions(-)
----------------------------------------------------------------------