From b4583271b808cfb58fc904c6954bba7bd7d55d06 Mon Sep 17 00:00:00 2001 From: Ibby Date: Sat, 4 Mar 2017 08:11:41 -0500 Subject: [PATCH] fix(file): fix return types fixes #1139 --- src/plugins/file.ts | 84 ++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/plugins/file.ts b/src/plugins/file.ts index 320717d4e3..be0d42b631 100644 --- a/src/plugins/file.ts +++ b/src/plugins/file.ts @@ -480,13 +480,13 @@ export class File { * * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above * @param {string} dir Name of directory to check - * @returns {Promise | Promise} Returns a Promise that resolves to true if the directory exists or rejects with an error. + * @returns {Promise} Returns a Promise that resolves to true if the directory exists or rejects with an error. */ - static checkDir(path: string, dir: string): Promise | Promise { + static checkDir(path: string, dir: string): Promise { if ((/^\//.test(dir))) { let err = new FileError(5); err.message = 'directory cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } let fullpath = path + dir; @@ -504,13 +504,13 @@ export class File { * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above * @param {string} dirName Name of directory to create * @param {boolean} replace If true, replaces file with same name. If false returns error - * @returns {Promise | Promise} Returns a Promise that resolves with a DirectoryEntry or rejects with an error. + * @returns {Promise} Returns a Promise that resolves with a DirectoryEntry or rejects with an error. */ - static createDir(path: string, dirName: string, replace: boolean): Promise | Promise { + static createDir(path: string, dirName: string, replace: boolean): Promise { if ((/^\//.test(dirName))) { let err = new FileError(5); err.message = 'directory cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } let options: Flags = { @@ -532,13 +532,13 @@ export class File { * * @param {string} path The path to the directory * @param {string} dirName The directory name - * @returns {Promise | Promise} Returns a Promise that resolves to a RemoveResult or rejects with an error. + * @returns {Promise} Returns a Promise that resolves to a RemoveResult or rejects with an error. */ - static removeDir(path: string, dirName: string): Promise | Promise { + static removeDir(path: string, dirName: string): Promise { if ((/^\//.test(dirName))) { let err = new FileError(5); err.message = 'directory cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } return File.resolveDirectoryUrl(path) @@ -557,15 +557,15 @@ export class File { * @param {string} dirName The source directory name * @param {string} newPath The destionation path to the directory * @param {string} newDirName The destination directory name - * @returns {Promise | Promise} Returns a Promise that resolves to the new DirectoryEntry object or rejects with an error. + * @returns {Promise} Returns a Promise that resolves to the new DirectoryEntry object or rejects with an error. */ - static moveDir(path: string, dirName: string, newPath: string, newDirName: string): Promise | Promise { + static moveDir(path: string, dirName: string, newPath: string, newDirName: string): Promise { newDirName = newDirName || dirName; if ((/^\//.test(newDirName))) { let err = new FileError(5); err.message = 'directory cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } return this.resolveDirectoryUrl(path) @@ -587,13 +587,13 @@ export class File { * @param {string} dirName Name of directory to copy * @param {string} newPath Base FileSystem of new location * @param {string} newDirName New name of directory to copy to (leave blank to remain the same) - * @returns {Promise | Promise} Returns a Promise that resolves to the new Entry object or rejects with an error. + * @returns {Promise} Returns a Promise that resolves to the new Entry object or rejects with an error. */ - static copyDir(path: string, dirName: string, newPath: string, newDirName: string): Promise | Promise { + static copyDir(path: string, dirName: string, newPath: string, newDirName: string): Promise { if ((/^\//.test(newDirName))) { let err = new FileError(5); err.message = 'directory cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } return this.resolveDirectoryUrl(path) @@ -660,13 +660,13 @@ export class File { * * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above * @param {string} file Name of file to check - * @returns {Promise | Promise} Returns a Promise that resolves with a boolean or rejects with an error. + * @returns {Promise} Returns a Promise that resolves with a boolean or rejects with an error. */ - static checkFile(path: string, file: string): Promise | Promise { + static checkFile(path: string, file: string): Promise { if ((/^\//.test(file))) { let err = new FileError(5); err.message = 'file cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } return File.resolveLocalFilesystemUrl(path + file) @@ -689,13 +689,13 @@ export class File { * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above * @param {string} fileName Name of file to create * @param {boolean} replace If true, replaces file with same name. If false returns error - * @returns {Promise | Promise} Returns a Promise that resolves to a FileEntry or rejects with an error. + * @returns {Promise} Returns a Promise that resolves to a FileEntry or rejects with an error. */ - static createFile(path: string, fileName: string, replace: boolean): Promise | Promise { + static createFile(path: string, fileName: string, replace: boolean): Promise { if ((/^\//.test(fileName))) { let err = new FileError(5); err.message = 'file-name cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } let options: Flags = { @@ -717,13 +717,13 @@ export class File { * * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above * @param {string} fileName Name of file to remove - * @returns {Promise | Promise} Returns a Promise that resolves to a RemoveResult or rejects with an error. + * @returns {Promise} Returns a Promise that resolves to a RemoveResult or rejects with an error. */ - static removeFile(path: string, fileName: string): Promise | Promise { + static removeFile(path: string, fileName: string): Promise { if ((/^\//.test(fileName))) { let err = new FileError(5); err.message = 'file-name cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } return File.resolveDirectoryUrl(path) @@ -806,13 +806,13 @@ export class File { * * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above * @param {string} file Name of file, relative to path. - * @returns {Promise | Promise} Returns a Promise that resolves with the contents of the file as string or rejects with an error. + * @returns {Promise} Returns a Promise that resolves with the contents of the file as string or rejects with an error. */ - static readAsText(path: string, file: string): Promise | Promise { + static readAsText(path: string, file: string): Promise { if ((/^\//.test(file))) { let err = new FileError(5); err.message = 'file-name cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } return File.resolveDirectoryUrl(path) @@ -847,13 +847,13 @@ export class File { * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above * @param {string} file Name of file, relative to path. - * @returns {Promise | Promise} Returns a Promise that resolves with the contents of the file as data URL or rejects with an error. + * @returns {Promise} Returns a Promise that resolves with the contents of the file as data URL or rejects with an error. */ - static readAsDataURL(path: string, file: string): Promise | Promise { + static readAsDataURL(path: string, file: string): Promise { if ((/^\//.test(file))) { let err = new FileError(5); err.message = 'file-name cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } return File.resolveDirectoryUrl(path) @@ -889,13 +889,13 @@ export class File { * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above * @param {string} file Name of file, relative to path. - * @returns {Promise | Promise} Returns a Promise that resolves with the contents of the file as string rejects with an error. + * @returns {Promise} Returns a Promise that resolves with the contents of the file as string rejects with an error. */ - static readAsBinaryString(path: string, file: string): Promise | Promise { + static readAsBinaryString(path: string, file: string): Promise { if ((/^\//.test(file))) { let err = new FileError(5); err.message = 'file-name cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } return File.resolveDirectoryUrl(path) @@ -930,13 +930,13 @@ export class File { * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above * @param {string} file Name of file, relative to path. - * @returns {Promise | Promise} Returns a Promise that resolves with the contents of the file as ArrayBuffer or rejects with an error. + * @returns {Promise} Returns a Promise that resolves with the contents of the file as ArrayBuffer or rejects with an error. */ - static readAsArrayBuffer(path: string, file: string): Promise | Promise { + static readAsArrayBuffer(path: string, file: string): Promise { if ((/^\//.test(file))) { let err = new FileError(5); err.message = 'file-name cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } return File.resolveDirectoryUrl(path) @@ -973,15 +973,15 @@ export class File { * @param {string} fileName Name of file to move * @param {string} newPath Base FileSystem of new location * @param {string} newFileName New name of file to move to (leave blank to remain the same) - * @returns {Promise | Promise} Returns a Promise that resolves to the new Entry or rejects with an error. + * @returns {Promise} Returns a Promise that resolves to the new Entry or rejects with an error. */ - static moveFile(path: string, fileName: string, newPath: string, newFileName: string): Promise | Promise { + static moveFile(path: string, fileName: string, newPath: string, newFileName: string): Promise { newFileName = newFileName || fileName; if ((/^\//.test(newFileName))) { let err = new FileError(5); err.message = 'file name cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } return this.resolveDirectoryUrl(path) @@ -1003,15 +1003,15 @@ export class File { * @param {string} fileName Name of file to copy * @param {string} newPath Base FileSystem of new location * @param {string} newFileName New name of file to copy to (leave blank to remain the same) - * @returns {Promise | Promise} Returns a Promise that resolves to an Entry or rejects with an error. + * @returns {Promise} Returns a Promise that resolves to an Entry or rejects with an error. */ - static copyFile(path: string, fileName: string, newPath: string, newFileName: string): Promise | Promise { + static copyFile(path: string, fileName: string, newPath: string, newFileName: string): Promise { newFileName = newFileName || fileName; if ((/^\//.test(newFileName))) { let err = new FileError(5); err.message = 'file name cannot start with \/'; - return Promise.reject(err); + return Promise.reject(err); } return this.resolveDirectoryUrl(path)