From 6e5c035b3911b3dfba81477fd5d586445d941521 Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Fri, 14 Sep 2018 00:50:44 +0200 Subject: [PATCH] chore(tslint): disable 'no-floating-promises' --- core/src/components/action-sheet/action-sheet.tsx | 2 +- core/src/components/alert/alert.tsx | 2 +- core/src/components/app/app.tsx | 4 ---- core/src/components/item-sliding/item-sliding.tsx | 2 -- core/src/components/loading/loading.tsx | 2 +- core/src/components/menu-toggle/menu-toggle.tsx | 3 +-- core/src/components/menu/menu.tsx | 3 +-- core/src/components/modal/modal.tsx | 4 ++-- core/src/components/nav-pop/nav-pop.tsx | 3 +-- core/src/components/nav-push/nav-push.tsx | 3 +-- core/src/components/nav-set-root/nav-set-root.tsx | 3 +-- core/src/components/nav/nav.tsx | 5 ----- core/src/components/nav/view-controller.ts | 1 - core/src/components/picker/picker.tsx | 4 ++-- core/src/components/popover/popover.tsx | 4 ++-- core/src/components/router/router.tsx | 1 - core/src/components/select/select.tsx | 1 - core/src/components/slides/slides.tsx | 2 +- core/src/components/tabs/tabs.tsx | 5 ++--- core/src/components/virtual-scroll/virtual-scroll.tsx | 1 - core/src/utils/gesture/gesture.ts | 1 - core/src/utils/hardware-back-button.ts | 1 - core/src/utils/input-shims/hacks/scroll-assist.ts | 1 - core/src/utils/overlays.ts | 2 -- core/src/utils/status-tap.ts | 1 - core/tslint.json | 2 +- 26 files changed, 18 insertions(+), 45 deletions(-) diff --git a/core/src/components/action-sheet/action-sheet.tsx b/core/src/components/action-sheet/action-sheet.tsx index c19acfdc64..2329a387dc 100644 --- a/core/src/components/action-sheet/action-sheet.tsx +++ b/core/src/components/action-sheet/action-sheet.tsx @@ -125,7 +125,7 @@ export class ActionSheet implements OverlayInterface { @Listen('ionBackdropTap') protected onBackdropTap() { - return this.dismiss(undefined, BACKDROP); + this.dismiss(undefined, BACKDROP); } @Listen('ionActionSheetWillDismiss') diff --git a/core/src/components/alert/alert.tsx b/core/src/components/alert/alert.tsx index b14ab13fb7..c1b20c228e 100644 --- a/core/src/components/alert/alert.tsx +++ b/core/src/components/alert/alert.tsx @@ -181,7 +181,7 @@ export class Alert implements OverlayInterface { @Listen('ionBackdropTap') protected onBackdropTap() { - return this.dismiss(undefined, BACKDROP); + this.dismiss(undefined, BACKDROP); } @Listen('ionAlertWillDismiss') diff --git a/core/src/components/app/app.tsx b/core/src/components/app/app.tsx index 17230899cf..67db8e23f8 100644 --- a/core/src/components/app/app.tsx +++ b/core/src/components/app/app.tsx @@ -36,27 +36,23 @@ export class App { function importHardwareBackButton(win: Window) { if (isPlatform(win, 'hybrid')) { - // tslint:disable-next-line:no-floating-promises import('../../utils/hardware-back-button').then(module => module.startHardwareBackButton(win)); } } function importStatusTap(win: Window, queue: QueueApi) { if (isPlatform(win, 'hybrid')) { - // tslint:disable-next-line:no-floating-promises import('../../utils/status-tap').then(module => module.startStatusTap(win, queue)); } } function importTapClick(win: Window) { - // tslint:disable-next-line:no-floating-promises import('../../utils/tap-click').then(module => module.startTapClick(win.document)); } function importInputShims(win: Window, config: Config) { const inputShims = config.getBoolean('inputShims', needInputShims(win)); if (inputShims) { - // tslint:disable-next-line:no-floating-promises import('../../utils/input-shims/input-shims').then(module => module.startInputShims(win.document, config)); } } diff --git a/core/src/components/item-sliding/item-sliding.tsx b/core/src/components/item-sliding/item-sliding.tsx index 7ed37927fd..9b15c70bcc 100644 --- a/core/src/components/item-sliding/item-sliding.tsx +++ b/core/src/components/item-sliding/item-sliding.tsx @@ -126,7 +126,6 @@ export class ItemSliding { @Method() async closeOpened(): Promise { if (openSlidingItem !== undefined) { - // tslint:disable-next-line:no-floating-promises openSlidingItem.close(); return true; } @@ -159,7 +158,6 @@ export class ItemSliding { private canStart(): boolean { const selected = openSlidingItem; if (selected && selected !== this.el) { - // tslint:disable-next-line:no-floating-promises this.closeOpened(); return false; } diff --git a/core/src/components/loading/loading.tsx b/core/src/components/loading/loading.tsx index c24f3d6349..fb952e61fc 100644 --- a/core/src/components/loading/loading.tsx +++ b/core/src/components/loading/loading.tsx @@ -137,7 +137,7 @@ export class Loading implements OverlayInterface { @Listen('ionBackdropTap') protected onBackdropTap() { - return this.dismiss(undefined, BACKDROP); + this.dismiss(undefined, BACKDROP); } /** diff --git a/core/src/components/menu-toggle/menu-toggle.tsx b/core/src/components/menu-toggle/menu-toggle.tsx index 7ff39de405..2b4b1d3d2c 100644 --- a/core/src/components/menu-toggle/menu-toggle.tsx +++ b/core/src/components/menu-toggle/menu-toggle.tsx @@ -39,10 +39,9 @@ export class MenuToggle { if (menuCtrl) { const menu = await menuCtrl.get(this.menu); if (menu) { - return menuCtrl.toggle(this.menu); + menuCtrl.toggle(this.menu); } } - return false; } @Listen('body:ionMenuChange') diff --git a/core/src/components/menu/menu.tsx b/core/src/components/menu/menu.tsx index 3cef2f52d8..8215bf9b48 100644 --- a/core/src/components/menu/menu.tsx +++ b/core/src/components/menu/menu.tsx @@ -223,10 +223,9 @@ export class Menu implements MenuI { if (shouldClose) { ev.preventDefault(); ev.stopPropagation(); - return this.close(); + this.close(); } } - return Promise.resolve(false); } @Method() diff --git a/core/src/components/modal/modal.tsx b/core/src/components/modal/modal.tsx index b300dcffe3..c108dd243a 100644 --- a/core/src/components/modal/modal.tsx +++ b/core/src/components/modal/modal.tsx @@ -127,12 +127,12 @@ export class Modal implements OverlayInterface { ev.stopPropagation(); ev.preventDefault(); - return this.dismiss(); + this.dismiss(); } @Listen('ionBackdropTap') protected onBackdropTap() { - return this.dismiss(undefined, BACKDROP); + this.dismiss(undefined, BACKDROP); } @Listen('ionModalDidPresent') diff --git a/core/src/components/nav-pop/nav-pop.tsx b/core/src/components/nav-pop/nav-pop.tsx index 149b576073..70abf79d38 100644 --- a/core/src/components/nav-pop/nav-pop.tsx +++ b/core/src/components/nav-pop/nav-pop.tsx @@ -11,9 +11,8 @@ export class NavPop { pop() { const nav = this.el.closest('ion-nav'); if (nav) { - return nav.pop({ skipIfBusy: true }); + nav.pop({ skipIfBusy: true }); } - return Promise.resolve(false); } } diff --git a/core/src/components/nav-push/nav-push.tsx b/core/src/components/nav-push/nav-push.tsx index b83c2f3e13..6c41c4fc57 100644 --- a/core/src/components/nav-push/nav-push.tsx +++ b/core/src/components/nav-push/nav-push.tsx @@ -23,8 +23,7 @@ export class NavPush { const nav = this.el.closest('ion-nav'); const toPush = this.component; if (nav && toPush !== undefined) { - return nav.push(toPush, this.componentProps, { skipIfBusy: true }); + nav.push(toPush, this.componentProps, { skipIfBusy: true }); } - return Promise.resolve(false); } } diff --git a/core/src/components/nav-set-root/nav-set-root.tsx b/core/src/components/nav-set-root/nav-set-root.tsx index 20c99d9bb3..3af781a533 100644 --- a/core/src/components/nav-set-root/nav-set-root.tsx +++ b/core/src/components/nav-set-root/nav-set-root.tsx @@ -24,8 +24,7 @@ export class NavSetRoot { const nav = this.el.closest('ion-nav'); const toPush = this.component; if (nav && toPush !== undefined) { - return nav.setRoot(toPush, this.componentProps, { skipIfBusy: true }); + nav.setRoot(toPush, this.componentProps, { skipIfBusy: true }); } - return Promise.resolve(false); } } diff --git a/core/src/components/nav/nav.tsx b/core/src/components/nav/nav.tsx index 600c8930df..d7f6bcdced 100644 --- a/core/src/components/nav/nav.tsx +++ b/core/src/components/nav/nav.tsx @@ -68,7 +68,6 @@ export class Nav implements NavOutlet { const isDev = Build.isDev; if (this.root !== undefined) { if (!this.useRouter) { - // tslint:disable-next-line:no-floating-promises this.setRoot(this.root, this.rootParams); } else if (isDev) { console.warn( @@ -508,8 +507,6 @@ export class Nav implements NavOutlet { const router = this.win.document.querySelector('ion-router'); if (router) { const direction = result.direction === 'back' ? -1 : 1; - - // tslint:disable-next-line:no-floating-promises router.navChanged(direction); } } @@ -549,7 +546,6 @@ export class Nav implements NavOutlet { return false; } - // tslint:disable-next-line:no-floating-promises this.runTransition(ti); return true; } @@ -915,7 +911,6 @@ export class Nav implements NavOutlet { progressAnimation: true }; - // tslint:disable-next-line:no-floating-promises this.queueTrns( { removeStart: -1, diff --git a/core/src/components/nav/view-controller.ts b/core/src/components/nav/view-controller.ts index 0109294bbb..958c72c3c2 100644 --- a/core/src/components/nav/view-controller.ts +++ b/core/src/components/nav/view-controller.ts @@ -42,7 +42,6 @@ export class ViewController { const element = this.element; if (element) { if (this.delegate) { - // tslint:disable-next-line:no-floating-promises this.delegate.removeViewFromDom(element.parentElement, element); } else { element.remove(); diff --git a/core/src/components/picker/picker.tsx b/core/src/components/picker/picker.tsx index eb442802c0..f16b1f9513 100644 --- a/core/src/components/picker/picker.tsx +++ b/core/src/components/picker/picker.tsx @@ -127,9 +127,9 @@ export class Picker implements OverlayInterface { protected onBackdropTap() { const cancelBtn = this.buttons.find(b => b.role === 'cancel'); if (cancelBtn) { - return this.buttonClick(cancelBtn); + this.buttonClick(cancelBtn); } else { - return this.dismiss(); + this.dismiss(); } } diff --git a/core/src/components/popover/popover.tsx b/core/src/components/popover/popover.tsx index f6da48731c..00f3c94416 100644 --- a/core/src/components/popover/popover.tsx +++ b/core/src/components/popover/popover.tsx @@ -137,12 +137,12 @@ export class Popover implements OverlayInterface { ev.stopPropagation(); ev.preventDefault(); - return this.dismiss(); + this.dismiss(); } @Listen('ionBackdropTap') protected onBackdropTap() { - return this.dismiss(undefined, BACKDROP); + this.dismiss(undefined, BACKDROP); } @Listen('ionPopoverDidPresent') diff --git a/core/src/components/router/router.tsx b/core/src/components/router/router.tsx index 8a43502610..99f06bfbf3 100644 --- a/core/src/components/router/router.tsx +++ b/core/src/components/router/router.tsx @@ -146,7 +146,6 @@ export class Router { private onRedirectChanged() { const path = this.getPath(); if (path && routeRedirect(path, readRedirects(this.el))) { - // tslint:disable-next-line:no-floating-promises this.writeNavStateRoot(path, RouterIntent.None); } } diff --git a/core/src/components/select/select.tsx b/core/src/components/select/select.tsx index cbc8c3f44d..7c46452458 100644 --- a/core/src/components/select/select.tsx +++ b/core/src/components/select/select.tsx @@ -314,7 +314,6 @@ export class Select { disabled: o.disabled, handler: () => { this.value = o.value; - // tslint:disable-next-line:no-floating-promises this.close(); } } as SelectPopoverOption; diff --git a/core/src/components/slides/slides.tsx b/core/src/components/slides/slides.tsx index daf68c236f..920aabae58 100644 --- a/core/src/components/slides/slides.tsx +++ b/core/src/components/slides/slides.tsx @@ -1,4 +1,4 @@ -import { Component, Element, Event, EventEmitter, Method, Prop, Watch, Listen } from '@stencil/core'; +import { Component, Element, Event, EventEmitter, Listen, Method, Prop, Watch } from '@stencil/core'; import { Mode } from '../../interface'; import { rIC } from '../../utils/helpers.js'; diff --git a/core/src/components/tabs/tabs.tsx b/core/src/components/tabs/tabs.tsx index 6193a0fe8c..719360a6e5 100644 --- a/core/src/components/tabs/tabs.tsx +++ b/core/src/components/tabs/tabs.tsx @@ -123,11 +123,10 @@ export class Tabs implements NavOutlet { if (this.useRouter && href !== undefined) { const router = this.doc.querySelector('ion-router'); if (router) { - return router.push(href); + router.push(href); } - return Promise.resolve(false); } else { - return this.select(selectedTab); + this.select(selectedTab); } } diff --git a/core/src/components/virtual-scroll/virtual-scroll.tsx b/core/src/components/virtual-scroll/virtual-scroll.tsx index f95bef4b93..7a7b829da6 100644 --- a/core/src/components/virtual-scroll/virtual-scroll.tsx +++ b/core/src/components/virtual-scroll/virtual-scroll.tsx @@ -281,7 +281,6 @@ export class VirtualScroll { } }; if (node && node.componentOnReady) { - // tslint:disable-next-line:no-floating-promises node.componentOnReady().then(update); } else { update(); diff --git a/core/src/utils/gesture/gesture.ts b/core/src/utils/gesture/gesture.ts index 9fedb69ea3..4c5e10d04f 100644 --- a/core/src/utils/gesture/gesture.ts +++ b/core/src/utils/gesture/gesture.ts @@ -147,7 +147,6 @@ export function createGesture(config: GestureConfig): Gesture { detail.startTimeStamp = detail.timeStamp; if (onWillStart) { - // tslint:disable-next-line:no-floating-promises onWillStart(detail).then(fireOnStart); } else { fireOnStart(); diff --git a/core/src/utils/hardware-back-button.ts b/core/src/utils/hardware-back-button.ts index a0734df236..f2cfd297f3 100644 --- a/core/src/utils/hardware-back-button.ts +++ b/core/src/utils/hardware-back-button.ts @@ -36,7 +36,6 @@ export function startHardwareBackButton(win: Window) { }); const result = handler!(); if (result != null) { - // tslint:disable-next-line:no-floating-promises result.then(() => busy = false); } } diff --git a/core/src/utils/input-shims/hacks/scroll-assist.ts b/core/src/utils/input-shims/hacks/scroll-assist.ts index 291359da9c..bf44473f33 100644 --- a/core/src/utils/input-shims/hacks/scroll-assist.ts +++ b/core/src/utils/input-shims/hacks/scroll-assist.ts @@ -64,7 +64,6 @@ function jsSetFocus( inputEl.focus(); // scroll the input into place - // tslint:disable-next-line:no-floating-promises contentEl.scrollByPoint(0, scrollData.scrollAmount, scrollData.scrollDuration).then(() => { // the scroll view is in the correct position now // give the native text input focus diff --git a/core/src/utils/overlays.ts b/core/src/utils/overlays.ts index 029fd77b85..95daca3cbd 100644 --- a/core/src/utils/overlays.ts +++ b/core/src/utils/overlays.ts @@ -25,7 +25,6 @@ export function createOverlay(element: T, opts: doc.body.addEventListener('keyup', ev => { if (ev.key === 'Escape') { - // tslint:disable-next-line:no-floating-promises closeTopOverlay(doc); } }); @@ -48,7 +47,6 @@ export function connectListeners(doc: Document) { if (ev.key === 'Escape') { const lastOverlay = getOverlay(doc); if (lastOverlay && lastOverlay.backdropDismiss) { - // tslint:disable-next-line:no-floating-promises lastOverlay.dismiss('backdrop'); } } diff --git a/core/src/utils/status-tap.ts b/core/src/utils/status-tap.ts index d8b627d75c..58f6a63f9c 100644 --- a/core/src/utils/status-tap.ts +++ b/core/src/utils/status-tap.ts @@ -11,7 +11,6 @@ export function startStatusTap(win: Window, queue: QueueApi) { } const contentEl = el.closest('ion-content'); if (contentEl) { - // tslint:disable-next-line:no-floating-promises contentEl.componentOnReady().then(() => { queue.write(() => contentEl.scrollToTop(300)); }); diff --git a/core/tslint.json b/core/tslint.json index 30987e5c35..54cf47cdfd 100644 --- a/core/tslint.json +++ b/core/tslint.json @@ -15,7 +15,7 @@ "no-null-keyword": false, "no-console": false, "no-unbound-method": true, - "no-floating-promises": true, + "no-floating-promises": false, "jsx-key": false, "jsx-self-close": false,