You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/07/09 21:11:32 UTC
git commit: [CB-4131] Use relative require paths in file plugin.
Updated Branches:
refs/heads/master 0bc647754 -> e71cc229f
[CB-4131] Use relative require paths in file plugin.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/commit/e71cc229
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/e71cc229
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/e71cc229
Branch: refs/heads/master
Commit: e71cc229fe3640e9a121e4c4af7077519478e1b4
Parents: 0bc6477
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jul 9 14:54:38 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Jul 9 14:54:38 2013 -0400
----------------------------------------------------------------------
www/DirectoryEntry.js | 8 ++++----
www/DirectoryReader.js | 6 +++---
www/Entry.js | 10 +++++-----
www/FileEntry.js | 8 ++++----
www/FileReader.js | 6 +++---
www/FileSystem.js | 2 +-
www/FileWriter.js | 4 ++--
www/blackberry10/DirectoryEntry.js | 8 ++++----
www/blackberry10/DirectoryReader.js | 4 ++--
www/blackberry10/Entry.js | 6 +++---
www/blackberry10/FileEntry.js | 8 ++++----
www/blackberry10/FileReader.js | 2 +-
www/blackberry10/FileWriter.js | 6 +++---
www/blackberry10/requestFileSystem.js | 6 +++---
www/blackberry10/resolveLocalFileSystemURI.js | 4 ++--
www/requestFileSystem.js | 4 ++--
www/resolveLocalFileSystemURI.js | 6 +++---
17 files changed, 49 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/DirectoryEntry.js
----------------------------------------------------------------------
diff --git a/www/DirectoryEntry.js b/www/DirectoryEntry.js
index e8d972c..9e55adf 100644
--- a/www/DirectoryEntry.js
+++ b/www/DirectoryEntry.js
@@ -22,9 +22,9 @@
var argscheck = require('cordova/argscheck'),
utils = require('cordova/utils'),
exec = require('cordova/exec'),
- Entry = require('org.apache.cordova.core.file.Entry'),
- FileError = require('org.apache.cordova.core.file.FileError'),
- DirectoryReader = require('org.apache.cordova.core.file.DirectoryReader');
+ Entry = require('./Entry'),
+ FileError = require('./FileError'),
+ DirectoryReader = require('./DirectoryReader');
/**
* An interface representing a directory on the file system.
@@ -93,7 +93,7 @@ DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCall
DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
argscheck.checkArgs('sOFF', 'DirectoryEntry.getFile', arguments);
var win = successCallback && function(result) {
- var FileEntry = require('org.apache.cordova.core.file.FileEntry');
+ var FileEntry = require('./FileEntry');
var entry = new FileEntry(result.name, result.fullPath);
successCallback(entry);
};
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/DirectoryReader.js
----------------------------------------------------------------------
diff --git a/www/DirectoryReader.js b/www/DirectoryReader.js
index 5f0cb38..07e7bf6 100644
--- a/www/DirectoryReader.js
+++ b/www/DirectoryReader.js
@@ -20,7 +20,7 @@
*/
var exec = require('cordova/exec'),
- FileError = require('org.apache.cordova.core.file.FileError') ;
+ FileError = require('./FileError') ;
/**
* An interface that lists the files and directories in a directory.
@@ -48,10 +48,10 @@ DirectoryReader.prototype.readEntries = function(successCallback, errorCallback)
for (var i=0; i<result.length; i++) {
var entry = null;
if (result[i].isDirectory) {
- entry = new (require('org.apache.cordova.core.file.DirectoryEntry'))();
+ entry = new (require('./DirectoryEntry'))();
}
else if (result[i].isFile) {
- entry = new (require('org.apache.cordova.core.file.FileEntry'))();
+ entry = new (require('./FileEntry'))();
}
entry.isDirectory = result[i].isDirectory;
entry.isFile = result[i].isFile;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/Entry.js
----------------------------------------------------------------------
diff --git a/www/Entry.js b/www/Entry.js
index 09018c3..c4985dc 100644
--- a/www/Entry.js
+++ b/www/Entry.js
@@ -21,8 +21,8 @@
var argscheck = require('cordova/argscheck'),
exec = require('cordova/exec'),
- FileError = require('org.apache.cordova.core.file.FileError'),
- Metadata = require('org.apache.cordova.core.file.Metadata');
+ FileError = require('./FileError'),
+ Metadata = require('./Metadata');
/**
* Represents a file or directory on the local file system.
@@ -107,7 +107,7 @@ Entry.prototype.moveTo = function(parent, newName, successCallback, errorCallbac
if (entry) {
if (successCallback) {
// create appropriate Entry object
- var result = (entry.isDirectory) ? new (require('org.apache.cordova.core.file.DirectoryEntry'))(entry.name, entry.fullPath) : new (require('org.apache.cordova.core.file.FileEntry'))(entry.name, entry.fullPath);
+ var result = (entry.isDirectory) ? new (require('./DirectoryEntry'))(entry.name, entry.fullPath) : new (require('org.apache.cordova.core.file.FileEntry'))(entry.name, entry.fullPath);
successCallback(result);
}
}
@@ -148,7 +148,7 @@ Entry.prototype.copyTo = function(parent, newName, successCallback, errorCallbac
if (entry) {
if (successCallback) {
// create appropriate Entry object
- var result = (entry.isDirectory) ? new (require('org.apache.cordova.core.file.DirectoryEntry'))(entry.name, entry.fullPath) : new (require('org.apache.cordova.core.file.FileEntry'))(entry.name, entry.fullPath);
+ var result = (entry.isDirectory) ? new (require('./DirectoryEntry'))(entry.name, entry.fullPath) : new (require('org.apache.cordova.core.file.FileEntry'))(entry.name, entry.fullPath);
successCallback(result);
}
}
@@ -207,7 +207,7 @@ Entry.prototype.remove = function(successCallback, errorCallback) {
Entry.prototype.getParent = function(successCallback, errorCallback) {
argscheck.checkArgs('FF', 'Entry.getParent', arguments);
var win = successCallback && function(result) {
- var DirectoryEntry = require('org.apache.cordova.core.file.DirectoryEntry');
+ var DirectoryEntry = require('./DirectoryEntry');
var entry = new DirectoryEntry(result.name, result.fullPath);
successCallback(entry);
};
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/FileEntry.js
----------------------------------------------------------------------
diff --git a/www/FileEntry.js b/www/FileEntry.js
index 70f5948..79064ac 100644
--- a/www/FileEntry.js
+++ b/www/FileEntry.js
@@ -21,10 +21,10 @@
var utils = require('cordova/utils'),
exec = require('cordova/exec'),
- Entry = require('org.apache.cordova.core.file.Entry'),
- FileWriter = require('org.apache.cordova.core.file.FileWriter'),
- File = require('org.apache.cordova.core.file.File'),
- FileError = require('org.apache.cordova.core.file.FileError');
+ Entry = require('./Entry'),
+ FileWriter = require('./FileWriter'),
+ File = require('./File'),
+ FileError = require('./FileError');
/**
* An interface representing a file on the file system.
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/FileReader.js
----------------------------------------------------------------------
diff --git a/www/FileReader.js b/www/FileReader.js
index c2b33bc..3cc75b5 100644
--- a/www/FileReader.js
+++ b/www/FileReader.js
@@ -22,9 +22,9 @@
var exec = require('cordova/exec'),
modulemapper = require('cordova/modulemapper'),
utils = require('cordova/utils'),
- File = require('org.apache.cordova.core.file.File'),
- FileError = require('org.apache.cordova.core.file.FileError'),
- ProgressEvent = require('org.apache.cordova.core.file.ProgressEvent'),
+ File = require('./File'),
+ FileError = require('./FileError'),
+ ProgressEvent = require('./ProgressEvent'),
origFileReader = modulemapper.getOriginalSymbol(this, 'FileReader');
/**
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/FileSystem.js
----------------------------------------------------------------------
diff --git a/www/FileSystem.js b/www/FileSystem.js
index e1d7c04..030365f 100644
--- a/www/FileSystem.js
+++ b/www/FileSystem.js
@@ -19,7 +19,7 @@
*
*/
-var DirectoryEntry = require('org.apache.cordova.core.file.DirectoryEntry');
+var DirectoryEntry = require('./DirectoryEntry');
/**
* An interface representing a file system
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/FileWriter.js
----------------------------------------------------------------------
diff --git a/www/FileWriter.js b/www/FileWriter.js
index 3115b51..44d7a32 100644
--- a/www/FileWriter.js
+++ b/www/FileWriter.js
@@ -20,8 +20,8 @@
*/
var exec = require('cordova/exec'),
- FileError = require('org.apache.cordova.core.file.FileError'),
- ProgressEvent = require('org.apache.cordova.core.file.ProgressEvent');
+ FileError = require('./FileError'),
+ ProgressEvent = require('./ProgressEvent');
/**
* This class writes to the mobile device file system.
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/blackberry10/DirectoryEntry.js
----------------------------------------------------------------------
diff --git a/www/blackberry10/DirectoryEntry.js b/www/blackberry10/DirectoryEntry.js
index a83f720..15289a7 100644
--- a/www/blackberry10/DirectoryEntry.js
+++ b/www/blackberry10/DirectoryEntry.js
@@ -21,10 +21,10 @@
var argscheck = require('cordova/argscheck'),
utils = require('cordova/utils'),
- Entry = require('org.apache.cordova.core.file.BB10Entry'),
- FileError = require('org.apache.cordova.core.file.FileError'),
- DirectoryReader = require('org.apache.cordova.core.file.BB10DirectoryReader'),
- fileUtils = require('org.apache.cordova.core.file.BB10Utils'),
+ Entry = require('./BB10Entry'),
+ FileError = require('./FileError'),
+ DirectoryReader = require('./BB10DirectoryReader'),
+ fileUtils = require('./BB10Utils'),
DirectoryEntry = function (name, fullPath) {
DirectoryEntry.__super__.constructor.call(this, false, true, name, fullPath);
};
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/blackberry10/DirectoryReader.js
----------------------------------------------------------------------
diff --git a/www/blackberry10/DirectoryReader.js b/www/blackberry10/DirectoryReader.js
index 5172083..a188545 100644
--- a/www/blackberry10/DirectoryReader.js
+++ b/www/blackberry10/DirectoryReader.js
@@ -19,8 +19,8 @@
*
*/
-var FileError = require('org.apache.cordova.core.file.FileError'),
- fileUtils = require('org.apache.cordova.core.file.BB10Utils');
+var FileError = require('./FileError'),
+ fileUtils = require('./BB10Utils');
function DirectoryReader(path) {
this.path = path;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/blackberry10/Entry.js
----------------------------------------------------------------------
diff --git a/www/blackberry10/Entry.js b/www/blackberry10/Entry.js
index 436513c..6bad13c 100644
--- a/www/blackberry10/Entry.js
+++ b/www/blackberry10/Entry.js
@@ -20,9 +20,9 @@
*/
var argscheck = require('cordova/argscheck'),
- FileError = require('org.apache.cordova.core.file.FileError'),
- Metadata = require('org.apache.cordova.core.file.Metadata'),
- fileUtils = require('org.apache.cordova.core.file.BB10Utils');
+ FileError = require('./FileError'),
+ Metadata = require('./Metadata'),
+ fileUtils = require('./BB10Utils');
function Entry(isFile, isDirectory, name, fullPath, fileSystem) {
this.isFile = !!isFile;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/blackberry10/FileEntry.js
----------------------------------------------------------------------
diff --git a/www/blackberry10/FileEntry.js b/www/blackberry10/FileEntry.js
index 91a4ad4..55927cd 100644
--- a/www/blackberry10/FileEntry.js
+++ b/www/blackberry10/FileEntry.js
@@ -20,10 +20,10 @@
*/
var utils = require('cordova/utils'),
- Entry = require('org.apache.cordova.core.file.BB10Entry'),
- FileWriter = require('org.apache.cordova.core.file.BB10FileWriter'),
- File = require('org.apache.cordova.core.file.File'),
- FileError = require('org.apache.cordova.core.file.FileError'),
+ Entry = require('./BB10Entry'),
+ FileWriter = require('./BB10FileWriter'),
+ File = require('./File'),
+ FileError = require('./FileError'),
FileEntry = function (name, fullPath) {
FileEntry.__super__.constructor.apply(this, [true, false, name, fullPath]);
};
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/blackberry10/FileReader.js
----------------------------------------------------------------------
diff --git a/www/blackberry10/FileReader.js b/www/blackberry10/FileReader.js
index 29b50b6..8210137 100644
--- a/www/blackberry10/FileReader.js
+++ b/www/blackberry10/FileReader.js
@@ -20,7 +20,7 @@
*/
var origFileReader = window.FileReader,
- fileUtils = require('org.apache.cordova.core.file.BB10Utils'),
+ fileUtils = require('./BB10Utils'),
utils = require('cordova/utils');
var FileReader = function() {
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/blackberry10/FileWriter.js
----------------------------------------------------------------------
diff --git a/www/blackberry10/FileWriter.js b/www/blackberry10/FileWriter.js
index 31eed38..4c7521d 100644
--- a/www/blackberry10/FileWriter.js
+++ b/www/blackberry10/FileWriter.js
@@ -19,9 +19,9 @@
*
*/
-var FileError = require('org.apache.cordova.core.file.FileError'),
- ProgressEvent = require('org.apache.cordova.core.file.ProgressEvent'),
- fileUtils = require('org.apache.cordova.core.file.BB10Utils'),
+var FileError = require('./FileError'),
+ ProgressEvent = require('./ProgressEvent'),
+ fileUtils = require('./BB10Utils'),
utils = require('cordova/utils');
function FileWriter (file) {
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/blackberry10/requestFileSystem.js
----------------------------------------------------------------------
diff --git a/www/blackberry10/requestFileSystem.js b/www/blackberry10/requestFileSystem.js
index 50f3d52..bb97564 100644
--- a/www/blackberry10/requestFileSystem.js
+++ b/www/blackberry10/requestFileSystem.js
@@ -19,9 +19,9 @@
*
*/
-var fileUtils = require('org.apache.cordova.core.file.BB10Utils'),
- FileError = require('org.apache.cordova.core.file.FileError'),
- FileSystem = require('org.apache.cordova.core.file.BB10FileSystem');
+var fileUtils = require('./BB10Utils'),
+ FileError = require('./FileError'),
+ FileSystem = require('./BB10FileSystem');
module.exports = function (type, size, success, fail) {
if (size >= 1000000000000000) {
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/blackberry10/resolveLocalFileSystemURI.js
----------------------------------------------------------------------
diff --git a/www/blackberry10/resolveLocalFileSystemURI.js b/www/blackberry10/resolveLocalFileSystemURI.js
index ba0e204..02e9e6c 100644
--- a/www/blackberry10/resolveLocalFileSystemURI.js
+++ b/www/blackberry10/resolveLocalFileSystemURI.js
@@ -19,8 +19,8 @@
*
*/
-var fileUtils = require('org.apache.cordova.core.file.BB10Utils'),
- FileError = require('org.apache.cordova.core.file.FileError');
+var fileUtils = require('./BB10Utils'),
+ FileError = require('./FileError');
module.exports = function (uri, success, fail) {
var type,
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/requestFileSystem.js
----------------------------------------------------------------------
diff --git a/www/requestFileSystem.js b/www/requestFileSystem.js
index 8b1508a..bad3291 100644
--- a/www/requestFileSystem.js
+++ b/www/requestFileSystem.js
@@ -20,8 +20,8 @@
*/
var argscheck = require('cordova/argscheck'),
- FileError = require('org.apache.cordova.core.file.FileError'),
- FileSystem = require('org.apache.cordova.core.file.FileSystem'),
+ FileError = require('./FileError'),
+ FileSystem = require('./FileSystem'),
exec = require('cordova/exec');
/**
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/e71cc229/www/resolveLocalFileSystemURI.js
----------------------------------------------------------------------
diff --git a/www/resolveLocalFileSystemURI.js b/www/resolveLocalFileSystemURI.js
index e127096..b5a0deb 100644
--- a/www/resolveLocalFileSystemURI.js
+++ b/www/resolveLocalFileSystemURI.js
@@ -20,9 +20,9 @@
*/
var argscheck = require('cordova/argscheck'),
- DirectoryEntry = require('org.apache.cordova.core.file.DirectoryEntry'),
- FileEntry = require('org.apache.cordova.core.file.FileEntry'),
- FileError = require('org.apache.cordova.core.file.FileError'),
+ DirectoryEntry = require('./DirectoryEntry'),
+ FileEntry = require('./FileEntry'),
+ FileError = require('./FileError'),
exec = require('cordova/exec');
/**