From 7f368b61bef2bfc0a7bb8c3fec09ba6d25031a5d Mon Sep 17 00:00:00 2001 From: Ibby Date: Wed, 1 Mar 2017 21:28:05 -0500 Subject: [PATCH] tslint and fix build issues --- src/plugins/file.ts | 66 +++++++++++++++---------------- src/plugins/gyroscope.ts | 6 +-- src/plugins/localnotifications.ts | 4 +- 3 files changed, 36 insertions(+), 40 deletions(-) diff --git a/src/plugins/file.ts b/src/plugins/file.ts index f6159409a..8566e2119 100644 --- a/src/plugins/file.ts +++ b/src/plugins/file.ts @@ -481,9 +481,9 @@ 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} Returns a Promise that resolves to true if the directory exists or rejects with an error. + * @returns {Promise | Promise} Returns a Promise that resolves to true if the directory exists or rejects with an error. */ - static checkDir(path: string, dir: string): Promise { + static checkDir(path: string, dir: string): Promise | Promise { if ((/^\//.test(dir))) { let err = new FileError(5); err.message = 'directory cannot start with \/'; @@ -505,9 +505,9 @@ 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} Returns a Promise that resolves with a DirectoryEntry or rejects with an error. + * @returns {Promise | Promise} Returns a Promise that resolves with a DirectoryEntry or rejects with an error. */ - static createDir(path: string, dirName: string, replace: boolean): Promise { + static createDir(path: string, dirName: string, replace: boolean): Promise | Promise { if ((/^\//.test(dirName))) { let err = new FileError(5); err.message = 'directory cannot start with \/'; @@ -533,9 +533,9 @@ export class File { * * @param {string} path The path to the directory * @param {string} dirName The directory name - * @returns {Promise} Returns a Promise that resolves to a RemoveResult or rejects with an error. + * @returns {Promise | Promise} Returns a Promise that resolves to a RemoveResult or rejects with an error. */ - static removeDir(path: string, dirName: string): Promise { + static removeDir(path: string, dirName: string): Promise | Promise { if ((/^\//.test(dirName))) { let err = new FileError(5); err.message = 'directory cannot start with \/'; @@ -558,9 +558,9 @@ 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} Returns a Promise that resolves to the new DirectoryEntry object or rejects with an error. + * @returns {Promise | 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 { + static moveDir(path: string, dirName: string, newPath: string, newDirName: string): Promise | Promise { newDirName = newDirName || dirName; if ((/^\//.test(newDirName))) { @@ -588,9 +588,9 @@ 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} Returns a Promise that resolves to the new Entry object or rejects with an error. + * @returns {Promise | 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 { + static copyDir(path: string, dirName: string, newPath: string, newDirName: string): Promise | Promise { if ((/^\//.test(newDirName))) { let err = new FileError(5); err.message = 'directory cannot start with \/'; @@ -661,9 +661,9 @@ 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} Returns a Promise that resolves with a boolean or rejects with an error. + * @returns {Promise | Promise} Returns a Promise that resolves with a boolean or rejects with an error. */ - static checkFile(path: string, file: string): Promise { + static checkFile(path: string, file: string): Promise | Promise { if ((/^\//.test(file))) { let err = new FileError(5); err.message = 'file cannot start with \/'; @@ -690,9 +690,9 @@ 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} Returns a Promise that resolves to a FileEntry or rejects with an error. + * @returns {Promise | Promise} Returns a Promise that resolves to a FileEntry or rejects with an error. */ - static createFile(path: string, fileName: string, replace: boolean): Promise { + static createFile(path: string, fileName: string, replace: boolean): Promise | Promise { if ((/^\//.test(fileName))) { let err = new FileError(5); err.message = 'file-name cannot start with \/'; @@ -718,9 +718,9 @@ 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} Returns a Promise that resolves to a RemoveResult or rejects with an error. + * @returns {Promise | Promise} Returns a Promise that resolves to a RemoveResult or rejects with an error. */ - static removeFile(path: string, fileName: string): Promise { + static removeFile(path: string, fileName: string): Promise | Promise { if ((/^\//.test(fileName))) { let err = new FileError(5); err.message = 'file-name cannot start with \/'; @@ -807,9 +807,9 @@ 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} Returns a Promise that resolves with the contents of the file as string or rejects with an error. + * @returns {Promise | 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 { + static readAsText(path: string, file: string): Promise | Promise { if ((/^\//.test(file))) { let err = new FileError(5); err.message = 'file-name cannot start with \/'; @@ -848,9 +848,9 @@ 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} Returns a Promise that resolves with the contents of the file as data URL or rejects with an error. + * @returns {Promise | 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 { + static readAsDataURL(path: string, file: string): Promise | Promise { if ((/^\//.test(file))) { let err = new FileError(5); err.message = 'file-name cannot start with \/'; @@ -890,9 +890,9 @@ 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} Returns a Promise that resolves with the contents of the file as string rejects with an error. + * @returns {Promise | 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 { + static readAsBinaryString(path: string, file: string): Promise | Promise { if ((/^\//.test(file))) { let err = new FileError(5); err.message = 'file-name cannot start with \/'; @@ -931,9 +931,9 @@ 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} Returns a Promise that resolves with the contents of the file as ArrayBuffer or rejects with an error. + * @returns {Promise | 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 { + static readAsArrayBuffer(path: string, file: string): Promise | Promise { if ((/^\//.test(file))) { let err = new FileError(5); err.message = 'file-name cannot start with \/'; @@ -974,9 +974,9 @@ 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} Returns a Promise that resolves to the new Entry or rejects with an error. + * @returns {Promise | 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 { + static moveFile(path: string, fileName: string, newPath: string, newFileName: string): Promise | Promise { newFileName = newFileName || fileName; if ((/^\//.test(newFileName))) { @@ -1004,9 +1004,9 @@ 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} Returns a Promise that resolves to an Entry or rejects with an error. + * @returns {Promise | 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 { + static copyFile(path: string, fileName: string, newPath: string, newFileName: string): Promise | Promise { newFileName = newFileName || fileName; if ((/^\//.test(newFileName))) { @@ -1027,17 +1027,13 @@ export class File { }); } - // these private methods help avoid cascading error handling - // in the public ones, primarily simply wrapping callback - // operations to return Promises that can then be chained. /** * @private */ private static fillErrorMessage(err: FileError): void { - if (typeof err === "DOMException") { - return; - } - err.message = File.cordovaFileError[err.code]; + try { + err.message = File.cordovaFileError[err.code]; + } catch (e) {} } /** diff --git a/src/plugins/gyroscope.ts b/src/plugins/gyroscope.ts index 108880c58..1203a18fc 100644 --- a/src/plugins/gyroscope.ts +++ b/src/plugins/gyroscope.ts @@ -11,17 +11,17 @@ export interface GyroscopeOrientation { * Represent x-axis */ x: number; - + /** * Represent y-axis */ y: number; - + /** * Represent z-axis */ z: number; - + /** * Represent timestamp of sensor read. Default is 10000ms */ diff --git a/src/plugins/localnotifications.ts b/src/plugins/localnotifications.ts index cbece790e..772767b1a 100644 --- a/src/plugins/localnotifications.ts +++ b/src/plugins/localnotifications.ts @@ -64,10 +64,10 @@ export interface ILocalNotification { * Default: res://ic_popup_reminder */ smallIcon?: string; - + /** * ANDROID ONLY - * RGB value for the background color of the smallIcon. + * RGB value for the background color of the smallIcon. * Default: Androids COLOR_DEFAULT, which will vary based on Android version. */ color?: string;