Updated Branches: refs/heads/master d3bca7d7d -> 39be67518
Fix require paths that were broken by plugin id changes 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/39be6751 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/39be6751 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/39be6751 Branch: refs/heads/master Commit: 39be6751836f7bdc09b3f15263e90bd6d78fa87b Parents: d3bca7d Author: Andrew Grieve <[email protected]> Authored: Fri Jun 28 19:46:10 2013 -0400 Committer: Andrew Grieve <[email protected]> Committed: Fri Jun 28 21:43:21 2013 -0400 ---------------------------------------------------------------------- docs/directoryentry/directoryentry.md | 2 +- docs/fileerror/fileerror.md | 2 +- 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/requestFileSystem.js | 4 ++-- www/resolveLocalFileSystemURI.js | 6 +++--- 11 files changed, 29 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/39be6751/docs/directoryentry/directoryentry.md ---------------------------------------------------------------------- diff --git a/docs/directoryentry/directoryentry.md b/docs/directoryentry/directoryentry.md index de01dd5..e21aa5f 100644 --- a/docs/directoryentry/directoryentry.md +++ b/docs/directoryentry/directoryentry.md @@ -387,4 +387,4 @@ May fail with a `ControlledAccessException` in the following cases: - If the device is connected by USB. -> Solution: disconnect the USB cable from the device and run again. \ No newline at end of file +> Solution: disconnect the USB cable from the device and run again. http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/39be6751/docs/fileerror/fileerror.md ---------------------------------------------------------------------- diff --git a/docs/fileerror/fileerror.md b/docs/fileerror/fileerror.md index c34c6be..1d7f39f 100644 --- a/docs/fileerror/fileerror.md +++ b/docs/fileerror/fileerror.md @@ -48,4 +48,4 @@ Description The `FileError` object is the only parameter provided to any of the File API's error callbacks. To determine the type of error, compare -its `code` property to any of the listings above. \ No newline at end of file +its `code` property to any of the listings above. http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/39be6751/www/DirectoryEntry.js ---------------------------------------------------------------------- diff --git a/www/DirectoryEntry.js b/www/DirectoryEntry.js index 4c1e088..e8d972c 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.FileUtils.Entry'), - FileError = require('org.apache.cordova.core.FileUtils.FileError'), - DirectoryReader = require('org.apache.cordova.core.FileUtils.DirectoryReader'); + Entry = require('org.apache.cordova.core.file.Entry'), + FileError = require('org.apache.cordova.core.file.FileError'), + DirectoryReader = require('org.apache.cordova.core.file.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.FileUtils.FileEntry'); + var FileEntry = require('org.apache.cordova.core.file.FileEntry'); var entry = new FileEntry(result.name, result.fullPath); successCallback(entry); }; http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/39be6751/www/DirectoryReader.js ---------------------------------------------------------------------- diff --git a/www/DirectoryReader.js b/www/DirectoryReader.js index d44acd2..849e26e 100644 --- a/www/DirectoryReader.js +++ b/www/DirectoryReader.js @@ -20,7 +20,7 @@ */ var exec = require('cordova/exec'), - FileError = require('org.apache.cordova.core.FileUtils.FileError') ; + FileError = require('org.apache.cordova.core.file.FileError') ; /** * An interface that lists the files and directories in a directory. @@ -41,10 +41,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.FileUtils.DirectoryEntry'))(); + entry = new (require('org.apache.cordova.core.file.DirectoryEntry'))(); } else if (result[i].isFile) { - entry = new (require('org.apache.cordova.core.FileUtils.FileEntry'))(); + entry = new (require('org.apache.cordova.core.file.FileEntry'))(); } entry.isDirectory = result[i].isDirectory; entry.isFile = result[i].isFile; http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/39be6751/www/Entry.js ---------------------------------------------------------------------- diff --git a/www/Entry.js b/www/Entry.js index f0d8b32..09018c3 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.FileUtils.FileError'), - Metadata = require('org.apache.cordova.core.FileUtils.Metadata'); + FileError = require('org.apache.cordova.core.file.FileError'), + Metadata = require('org.apache.cordova.core.file.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.FileUtils.DirectoryEntry'))(entry.name, entry.fullPath) : new (require('org.apache.cordova.core.FileUtils.FileEntry'))(entry.name, entry.fullPath); + 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); 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.FileUtils.DirectoryEntry'))(entry.name, entry.fullPath) : new (require('org.apache.cordova.core.FileUtils.FileEntry'))(entry.name, entry.fullPath); + 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); 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.FileUtils.DirectoryEntry'); + var DirectoryEntry = require('org.apache.cordova.core.file.DirectoryEntry'); var entry = new DirectoryEntry(result.name, result.fullPath); successCallback(entry); }; http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/39be6751/www/FileEntry.js ---------------------------------------------------------------------- diff --git a/www/FileEntry.js b/www/FileEntry.js index 73f61c9..70f5948 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.FileUtils.Entry'), - FileWriter = require('org.apache.cordova.core.FileUtils.FileWriter'), - File = require('org.apache.cordova.core.FileUtils.File'), - FileError = require('org.apache.cordova.core.FileUtils.FileError'); + 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'); /** * An interface representing a file on the file system. http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/39be6751/www/FileReader.js ---------------------------------------------------------------------- diff --git a/www/FileReader.js b/www/FileReader.js index 92c3e3b..c2b33bc 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.FileUtils.File'), - FileError = require('org.apache.cordova.core.FileUtils.FileError'), - ProgressEvent = require('org.apache.cordova.core.FileUtils.ProgressEvent'), + File = require('org.apache.cordova.core.file.File'), + FileError = require('org.apache.cordova.core.file.FileError'), + ProgressEvent = require('org.apache.cordova.core.file.ProgressEvent'), origFileReader = modulemapper.getOriginalSymbol(this, 'FileReader'); /** http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/39be6751/www/FileSystem.js ---------------------------------------------------------------------- diff --git a/www/FileSystem.js b/www/FileSystem.js index 874bbed..e1d7c04 100644 --- a/www/FileSystem.js +++ b/www/FileSystem.js @@ -19,7 +19,7 @@ * */ -var DirectoryEntry = require('org.apache.cordova.core.FileUtils.DirectoryEntry'); +var DirectoryEntry = require('org.apache.cordova.core.file.DirectoryEntry'); /** * An interface representing a file system http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/39be6751/www/FileWriter.js ---------------------------------------------------------------------- diff --git a/www/FileWriter.js b/www/FileWriter.js index ef4ea3b..7994ed4 100644 --- a/www/FileWriter.js +++ b/www/FileWriter.js @@ -20,8 +20,8 @@ */ var exec = require('cordova/exec'), - FileError = require('org.apache.cordova.core.FileUtils.FileError'), - ProgressEvent = require('org.apache.cordova.core.FileUtils.ProgressEvent'); + FileError = require('org.apache.cordova.core.file.FileError'), + ProgressEvent = require('org.apache.cordova.core.file.ProgressEvent'); /** * This class writes to the mobile device file system. http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/39be6751/www/requestFileSystem.js ---------------------------------------------------------------------- diff --git a/www/requestFileSystem.js b/www/requestFileSystem.js index 3b9010c..8b1508a 100644 --- a/www/requestFileSystem.js +++ b/www/requestFileSystem.js @@ -20,8 +20,8 @@ */ var argscheck = require('cordova/argscheck'), - FileError = require('org.apache.cordova.core.FileUtils.FileError'), - FileSystem = require('org.apache.cordova.core.FileUtils.FileSystem'), + FileError = require('org.apache.cordova.core.file.FileError'), + FileSystem = require('org.apache.cordova.core.file.FileSystem'), exec = require('cordova/exec'); /** http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/39be6751/www/resolveLocalFileSystemURI.js ---------------------------------------------------------------------- diff --git a/www/resolveLocalFileSystemURI.js b/www/resolveLocalFileSystemURI.js index 717d07b..e127096 100644 --- a/www/resolveLocalFileSystemURI.js +++ b/www/resolveLocalFileSystemURI.js @@ -20,9 +20,9 @@ */ var argscheck = require('cordova/argscheck'), - DirectoryEntry = require('org.apache.cordova.core.FileUtils.DirectoryEntry'), - FileEntry = require('org.apache.cordova.core.FileUtils.FileEntry'), - FileError = require('org.apache.cordova.core.FileUtils.FileError'), + DirectoryEntry = require('org.apache.cordova.core.file.DirectoryEntry'), + FileEntry = require('org.apache.cordova.core.file.FileEntry'), + FileError = require('org.apache.cordova.core.file.FileError'), exec = require('cordova/exec'); /**
