Updated Branches: refs/heads/master 221849c28 -> 94a42b138
[all] Add argscheck to DirectoryEntry.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/94a42b13 Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/94a42b13 Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/94a42b13 Branch: refs/heads/master Commit: 94a42b1385afc0d5cde38ccbad1cf08b51a6f3a7 Parents: 221849c Author: Andrew Grieve <[email protected]> Authored: Tue Jan 8 15:41:53 2013 -0500 Committer: Andrew Grieve <[email protected]> Committed: Thu Jan 10 09:34:18 2013 -0500 ---------------------------------------------------------------------- lib/common/plugin/DirectoryEntry.js | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-js/blob/94a42b13/lib/common/plugin/DirectoryEntry.js ---------------------------------------------------------------------- diff --git a/lib/common/plugin/DirectoryEntry.js b/lib/common/plugin/DirectoryEntry.js index 8a7f97d..de4f530 100644 --- a/lib/common/plugin/DirectoryEntry.js +++ b/lib/common/plugin/DirectoryEntry.js @@ -19,7 +19,8 @@ * */ -var utils = require('cordova/utils'), +var argscheck = require('cordova/argscheck'), + utils = require('cordova/utils'), exec = require('cordova/exec'), Entry = require('cordova/plugin/Entry'), FileError = require('cordova/plugin/FileError'), @@ -35,7 +36,7 @@ var utils = require('cordova/utils'), * TODO: implement this!!! {FileSystem} filesystem on which the directory resides (readonly) */ var DirectoryEntry = function(name, fullPath) { - DirectoryEntry.__super__.constructor.apply(this, [false, true, name, fullPath]); + DirectoryEntry.__super__.constructor.call(this, false, true, name, fullPath); }; utils.extend(DirectoryEntry, Entry); @@ -56,11 +57,12 @@ DirectoryEntry.prototype.createReader = function() { * @param {Function} errorCallback is called with a FileError */ DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) { - var win = typeof successCallback !== 'function' ? null : function(result) { + argscheck.checkArgs('sOFF', 'DirectoryEntry.getDirectory', arguments); + var win = successCallback && function(result) { var entry = new DirectoryEntry(result.name, result.fullPath); successCallback(entry); }; - var fail = typeof errorCallback !== 'function' ? null : function(code) { + var fail = errorCallback && function(code) { errorCallback(new FileError(code)); }; exec(win, fail, "File", "getDirectory", [this.fullPath, path, options]); @@ -73,7 +75,8 @@ DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, * @param {Function} errorCallback is called with a FileError */ DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) { - var fail = typeof errorCallback !== 'function' ? null : function(code) { + argscheck.checkArgs('FF', 'DirectoryEntry.removeRecursively', arguments); + var fail = errorCallback && function(code) { errorCallback(new FileError(code)); }; exec(successCallback, fail, "File", "removeRecursively", [this.fullPath]); @@ -88,12 +91,13 @@ DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCall * @param {Function} errorCallback is called with a FileError */ DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) { - var win = typeof successCallback !== 'function' ? null : function(result) { + argscheck.checkArgs('sOFF', 'DirectoryEntry.getFile', arguments); + var win = successCallback && function(result) { var FileEntry = require('cordova/plugin/FileEntry'); var entry = new FileEntry(result.name, result.fullPath); successCallback(entry); }; - var fail = typeof errorCallback !== 'function' ? null : function(code) { + var fail = errorCallback && function(code) { errorCallback(new FileError(code)); }; exec(win, fail, "File", "getFile", [this.fullPath, path, options]);
