You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ti...@apache.org on 2013/01/03 20:22:21 UTC
webworks commit: [CB-2120] - update javascript
Updated Branches:
refs/heads/master 80e3ef1a5 -> 8c013ff91
[CB-2120] - update javascript
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/8c013ff9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/8c013ff9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/8c013ff9
Branch: refs/heads/master
Commit: 8c013ff9154a28ecf2cb2fd20c8f6ee61e97fb1a
Parents: 80e3ef1
Author: Tim Kim <ti...@adobe.com>
Authored: Thu Jan 3 11:22:12 2013 -0800
Committer: Tim Kim <ti...@adobe.com>
Committed: Thu Jan 3 11:22:12 2013 -0800
----------------------------------------------------------------------
javascript/cordova.blackberry.js | 443 ++++++++++++++++++++++++++++++--
1 files changed, 415 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/8c013ff9/javascript/cordova.blackberry.js
----------------------------------------------------------------------
diff --git a/javascript/cordova.blackberry.js b/javascript/cordova.blackberry.js
index 6e78d85..3637ee3 100644
--- a/javascript/cordova.blackberry.js
+++ b/javascript/cordova.blackberry.js
@@ -1,6 +1,6 @@
-// commit d8204cc0f8f1f2e72d95b4c811caa0635bb05a84
+// commit 24d65ab645742e8360c3dd16d7a36411cc3383e0
-// File generated at :: Sat Dec 15 2012 09:35:09 GMT-0800 (PST)
+// File generated at :: Thu Jan 03 2013 11:11:25 GMT-0800 (PST)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -5344,7 +5344,7 @@ module.exports = {
model: "PlayBook",
name: "PlayBook", // deprecated: please use device.model
uuid: info.uuid,
- cordova: "2.3.0rc2"
+ cordova: "2.3.0"
});
}),
request = new blackberry.transport.RemoteFunctionCall("org/apache/cordova/getDeviceInfo");
@@ -8935,7 +8935,7 @@ module.exports = {
model: "Dev Alpha",
name: "Dev Alpha", // deprecated: please use device.model
uuid: blackberry.identity.uuid,
- cordova: "2.3.0rc2"
+ cordova: "2.3.0"
});
return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "Device info returned" };
@@ -8944,6 +8944,414 @@ module.exports = {
});
+// file: lib/blackberry/plugin/qnx/file.js
+define("cordova/plugin/qnx/file", function(require, exports, module) {
+
+/*global WebKitBlobBuilder:false */
+var cordova = require('cordova'),
+ FileError = require('cordova/plugin/FileError'),
+ DirectoryEntry = require('cordova/plugin/DirectoryEntry'),
+ FileEntry = require('cordova/plugin/FileEntry'),
+ File = require('cordova/plugin/File'),
+ FileSystem = require('cordova/plugin/FileSystem'),
+ FileReader = require('cordova/plugin/FileReader'),
+ nativeRequestFileSystem = window.webkitRequestFileSystem,
+ nativeResolveLocalFileSystemURI = function(uri, success, fail) {
+ if (uri.substring(0,11) !== "filesystem:") {
+ uri = "filesystem:" + uri;
+ }
+ window.webkitResolveLocalFileSystemURL(uri, success, fail);
+ },
+ NativeFileReader = window.FileReader;
+
+window.FileReader = FileReader;
+window.File = File;
+
+function getFileSystemName(nativeFs) {
+ return (nativeFs.name.indexOf("Persistent") != -1) ? "persistent" : "temporary";
+}
+
+function makeEntry(entry) {
+ if (entry.isDirectory) {
+ return new DirectoryEntry(entry.name, decodeURI(entry.toURL()).substring(11));
+ }
+ else {
+ return new FileEntry(entry.name, decodeURI(entry.toURL()).substring(11));
+ }
+}
+
+module.exports = {
+ /* requestFileSystem */
+ requestFileSystem: function(args, successCallback, errorCallback) {
+ var type = args[0],
+ size = args[1];
+
+ nativeRequestFileSystem(type, size, function(nativeFs) {
+ successCallback(new FileSystem(getFileSystemName(nativeFs), makeEntry(nativeFs.root)));
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ /* resolveLocalFileSystemURI */
+ resolveLocalFileSystemURI: function(args, successCallback, errorCallback) {
+ var uri = args[0];
+
+ nativeResolveLocalFileSystemURI(uri, function(entry) {
+ successCallback(makeEntry(entry));
+ }, function(error) {
+ var code = error.code;
+ switch (code) {
+ case 5:
+ code = FileError.NOT_FOUND_ERR;
+ break;
+
+ case 2:
+ code = FileError.ENCODING_ERR;
+ break;
+ }
+ errorCallback(code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ /* DirectoryReader */
+ readEntries: function(args, successCallback, errorCallback) {
+ var uri = args[0];
+
+ nativeResolveLocalFileSystemURI(uri, function(dirEntry) {
+ var reader = dirEntry.createReader();
+ reader.readEntries(function(entries) {
+ var retVal = [];
+ for (var i = 0; i < entries.length; i++) {
+ retVal.push(makeEntry(entries[i]));
+ }
+ successCallback(retVal);
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ /* Entry */
+ getMetadata: function(args, successCallback, errorCallback) {
+ var uri = args[0];
+
+ nativeResolveLocalFileSystemURI(uri, function(entry) {
+ entry.getMetadata(function(metaData) {
+ successCallback(metaData.modificationTime);
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ moveTo: function(args, successCallback, errorCallback) {
+ var srcUri = args[0],
+ parentUri = args[1],
+ name = args[2];
+
+ nativeResolveLocalFileSystemURI(srcUri, function(source) {
+ nativeResolveLocalFileSystemURI(parentUri, function(parent) {
+ source.moveTo(parent, name, function(entry) {
+ successCallback(makeEntry(entry));
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ copyTo: function(args, successCallback, errorCallback) {
+ var srcUri = args[0],
+ parentUri = args[1],
+ name = args[2];
+
+ nativeResolveLocalFileSystemURI(srcUri, function(source) {
+ nativeResolveLocalFileSystemURI(parentUri, function(parent) {
+ source.copyTo(parent, name, function(entry) {
+ successCallback(makeEntry(entry));
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ remove: function(args, successCallback, errorCallback) {
+ var uri = args[0];
+
+ nativeResolveLocalFileSystemURI(uri, function(entry) {
+ if (entry.fullPath === "/") {
+ errorCallback(FileError.NO_MODIFICATION_ALLOWED_ERR);
+ } else {
+ entry.remove(
+ function (success) {
+ if (successCallback) {
+ successCallback(success);
+ }
+ },
+ function(error) {
+ if (errorCallback) {
+ errorCallback(error.code);
+ }
+ }
+ );
+ }
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ getParent: function(args, successCallback, errorCallback) {
+ var uri = args[0];
+
+ nativeResolveLocalFileSystemURI(uri, function(entry) {
+ entry.getParent(function(entry) {
+ successCallback(makeEntry(entry));
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ /* FileEntry */
+ getFileMetadata: function(args, successCallback, errorCallback) {
+ var uri = args[0];
+
+ nativeResolveLocalFileSystemURI(uri, function(entry) {
+ entry.file(function(file) {
+ var retVal = new File(file.name, decodeURI(entry.toURL()), file.type, file.lastModifiedDate, file.size);
+ successCallback(retVal);
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ /* DirectoryEntry */
+ getDirectory: function(args, successCallback, errorCallback) {
+ var uri = args[0],
+ path = args[1],
+ options = args[2];
+
+ nativeResolveLocalFileSystemURI(uri, function(entry) {
+ entry.getDirectory(path, options, function(entry) {
+ successCallback(makeEntry(entry));
+ }, function(error) {
+ if (error.code === FileError.INVALID_MODIFICATION_ERR) {
+ if (options.create) {
+ errorCallback(FileError.PATH_EXISTS_ERR);
+ } else {
+ errorCallback(FileError.ENCODING_ERR);
+ }
+ } else {
+ errorCallback(error.code);
+ }
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ removeRecursively: function(args, successCallback, errorCallback) {
+ var uri = args[0];
+
+ nativeResolveLocalFileSystemURI(uri, function(entry) {
+ if (entry.fullPath === "/") {
+ errorCallback(FileError.NO_MODIFICATION_ALLOWED_ERR);
+ } else {
+ entry.removeRecursively(
+ function (success) {
+ if (successCallback) {
+ successCallback(success);
+ }
+ },
+ function(error) {
+ errorCallback(error.code);
+ }
+ );
+ }
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ getFile: function(args, successCallback, errorCallback) {
+ var uri = args[0],
+ path = args[1],
+ options = args[2];
+
+ nativeResolveLocalFileSystemURI(uri, function(entry) {
+ entry.getFile(path, options, function(entry) {
+ successCallback(makeEntry(entry));
+ }, function(error) {
+ if (error.code === FileError.INVALID_MODIFICATION_ERR) {
+ if (options.create) {
+ errorCallback(FileError.PATH_EXISTS_ERR);
+ } else {
+ errorCallback(FileError.NOT_FOUND_ERR);
+ }
+ } else {
+ errorCallback(error.code);
+ }
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ /* FileReader */
+ readAsText: function(args, successCallback, errorCallback) {
+ var uri = args[0],
+ encoding = args[1];
+
+ nativeResolveLocalFileSystemURI(uri, function(entry) {
+ var onLoadEnd = function(evt) {
+ if (!evt.target.error) {
+ successCallback(evt.target.result);
+ }
+ },
+ onError = function(evt) {
+ errorCallback(evt.target.error.code);
+ };
+
+ var reader = new NativeFileReader();
+
+ reader.onloadend = onLoadEnd;
+ reader.onerror = onError;
+ entry.file(function(file) {
+ reader.readAsText(file, encoding);
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ readAsDataURL: function(args, successCallback, errorCallback) {
+ var uri = args[0];
+
+ nativeResolveLocalFileSystemURI(uri, function(entry) {
+ var onLoadEnd = function(evt) {
+ if (!evt.target.error) {
+ successCallback(evt.target.result);
+ }
+ },
+ onError = function(evt) {
+ errorCallback(evt.target.error.code);
+ };
+
+ var reader = new NativeFileReader();
+
+ reader.onloadend = onLoadEnd;
+ reader.onerror = onError;
+ entry.file(function(file) {
+ reader.readAsDataURL(file);
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ /* FileWriter */
+ write: function(args, successCallback, errorCallback) {
+ var uri = args[0],
+ text = args[1],
+ position = args[2];
+
+ nativeResolveLocalFileSystemURI(uri, function(entry) {
+ var onWriteEnd = function(evt) {
+ if(!evt.target.error) {
+ successCallback(evt.target.position - position);
+ } else {
+ errorCallback(evt.target.error.code);
+ }
+ },
+ onError = function(evt) {
+ errorCallback(evt.target.error.code);
+ };
+
+ entry.createWriter(function(writer) {
+ writer.onwriteend = onWriteEnd;
+ writer.onerror = onError;
+
+ writer.seek(position);
+ writer.write(new Blob([text], {type: "text/plain"}));
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ },
+
+ truncate: function(args, successCallback, errorCallback) {
+ var uri = args[0],
+ size = args[1];
+
+ nativeResolveLocalFileSystemURI(uri, function(entry) {
+ var onWriteEnd = function(evt) {
+ if(!evt.target.error) {
+ successCallback(evt.target.length);
+ } else {
+ errorCallback(evt.target.error.code);
+ }
+ },
+ onError = function(evt) {
+ errorCallback(evt.target.error.code);
+ };
+
+ entry.createWriter(function(writer) {
+ writer.onwriteend = onWriteEnd;
+ writer.onerror = onError;
+
+ writer.truncate(size);
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ }, function(error) {
+ errorCallback(error.code);
+ });
+ return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "async"};
+ }
+};
+
+});
+
// file: lib/blackberry/plugin/qnx/fileTransfer.js
define("cordova/plugin/qnx/fileTransfer", function(require, exports, module) {
@@ -9021,6 +9429,7 @@ var cordova = require('cordova'),
'Logger' : require('cordova/plugin/webworks/logger'),
'Notification' : require('cordova/plugin/webworks/notification'),
'Media': require('cordova/plugin/webworks/media'),
+ 'File' : require('cordova/plugin/qnx/file'),
'FileTransfer': require('cordova/plugin/qnx/fileTransfer')
};
@@ -9087,14 +9496,6 @@ module.exports = {
});
});
},
- objects: {
- requestFileSystem:{
- path: 'cordova/plugin/qnx/requestFileSystem'
- },
- resolveLocalFileSystemURI:{
- path: 'cordova/plugin/qnx/resolveLocalFileSystemURI'
- }
- },
merges: {
navigator: {
children: {
@@ -9108,20 +9509,6 @@ module.exports = {
});
-// file: lib/blackberry/plugin/qnx/requestFileSystem.js
-define("cordova/plugin/qnx/requestFileSystem", function(require, exports, module) {
-
-module.exports = window.webkitRequestFileSystem;
-
-});
-
-// file: lib/blackberry/plugin/qnx/resolveLocalFileSystemURI.js
-define("cordova/plugin/qnx/resolveLocalFileSystemURI", function(require, exports, module) {
-
-module.exports = window.webkitResolveLocalFileSystemURI;
-
-});
-
// file: lib/common/plugin/requestFileSystem.js
define("cordova/plugin/requestFileSystem", function(require, exports, module) {
@@ -9737,12 +10124,12 @@ window.cordova = require('cordova');
// Drop the common globals into the window object, but be nice and don't overwrite anything.
builder.buildIntoButDoNotClobber(base.defaults, context);
- builder.buildIntoAndMerge(base.merges, context);
builder.buildIntoAndClobber(base.clobbers, context);
+ builder.buildIntoAndMerge(base.merges, context);
builder.buildIntoButDoNotClobber(platform.defaults, context);
- builder.buildIntoAndMerge(platform.merges, context);
builder.buildIntoAndClobber(platform.clobbers, context);
+ builder.buildIntoAndMerge(platform.merges, context);
// Call the platform-specific initialization
platform.initialize();