From efd54750bf44b622a20078be02a2335aabc6dcec Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Wed, 5 Jul 2017 16:21:55 -0500 Subject: [PATCH] chore(lint): fix all code that doesn't pass tslint * chore(lint): update to work with newer tslint * chore(lint): fix all code that doesnt pass tslint fix all code that doesnt pass tslint --- demos/src/alert/pages/page-one/page-one.ts | 4 +- demos/src/events/app/app.component.ts | 2 +- .../item-sliding/pages/page-one/page-one.ts | 2 +- package-lock.json | 214 ++++++++++++------ package.json | 6 +- src/animations/animation.ts | 87 ++++--- .../action-sheet/action-sheet-component.ts | 6 +- .../action-sheet/action-sheet-options.ts | 2 +- src/components/action-sheet/action-sheet.ts | 4 +- src/components/alert/alert-component.ts | 6 +- src/components/alert/alert-options.ts | 2 +- src/components/alert/alert.ts | 4 +- .../alert/test/dismiss/app.module.ts | 2 +- src/components/app/app.ts | 9 +- src/components/app/click-block.ts | 2 +- src/components/app/menu-controller.ts | 2 +- src/components/app/menu-interface.ts | 4 +- src/components/app/overlay-portal.ts | 2 +- src/components/app/test/app.spec.ts | 2 +- src/components/checkbox/test/checkbox.spec.ts | 4 +- src/components/content/content.ts | 4 +- src/components/datetime/datetime.ts | 19 +- src/components/datetime/test/datetime.spec.ts | 6 +- src/components/fab/fab-list.ts | 2 +- src/components/fab/fab.ts | 2 +- src/components/img/img-interface.ts | 2 +- .../infinite-scroll/test/basic/app.module.ts | 4 +- .../test/short-list/app.module.ts | 2 +- src/components/input/input.ts | 26 ++- .../form-inputs/pages/root-page/root-page.ts | 2 +- .../highlight/pages/root-page/root-page.ts | 2 +- src/components/input/test/text-input.spec.ts | 6 +- src/components/ion.ts | 2 +- src/components/item/item-reorder-gesture.ts | 2 +- src/components/item/item-reorder.ts | 8 +- src/components/item/item-sliding-gesture.ts | 2 +- src/components/item/item-sliding.ts | 23 +- src/components/item/item.ts | 2 +- .../groups/pages/session-list/session-list.ts | 2 +- .../test/sliding/pages/root-page/root-page.ts | 4 +- src/components/label/label.ts | 2 +- src/components/loading/loading-component.ts | 8 +- src/components/loading/loading.ts | 2 +- .../loading/test/basic/app/app.component.ts | 4 +- src/components/menu/menu-gestures.ts | 10 +- src/components/menu/menu-toggle.ts | 4 +- src/components/menu/menu.ts | 6 +- .../menu/test/enable-disable/app.module.ts | 4 +- .../menu/test/overlay/app.module.ts | 4 +- src/components/menu/test/push/app.module.ts | 4 +- src/components/menu/test/reveal/app.module.ts | 2 +- src/components/modal/modal-component.ts | 2 +- src/components/modal/modal-impl.ts | 2 +- .../modal/test/basic/app/app.module.ts | 2 +- .../test/basic/pages/page-one/page-one.ts | 2 +- .../test/basic/pages/page-two/page-two.ts | 2 +- src/components/nav/nav.ts | 2 +- .../test/basic/pages/first-page/first-page.ts | 4 +- .../test/basic/pages/full-page/full-page.ts | 2 +- .../nav/test/worst-case/app.module.ts | 2 +- src/components/picker/picker-column.ts | 2 +- src/components/picker/picker-component.ts | 10 +- src/components/picker/picker.ts | 4 +- src/components/popover/popover-component.ts | 4 +- src/components/popover/popover-impl.ts | 2 +- .../test/basic/pages/page-one/page-one.ts | 2 +- src/components/radio/radio-button.ts | 2 +- src/components/radio/test/radio.spec.ts | 2 +- src/components/range/range-knob.ts | 2 +- src/components/range/test/range.spec.ts | 4 +- src/components/refresher/refresher.ts | 2 +- .../refresher/test/basic/app.module.ts | 2 +- .../refresher/test/navigation/app.module.ts | 4 +- src/components/scroll/scroll.ts | 2 +- .../test/basic/pages/root-page/root-page.ts | 2 +- .../test/nav/pages/detail-page/detail-page.ts | 2 +- .../test/nav/pages/search-page/search-page.ts | 2 +- .../test/swipe/pages/e2e-page/e2e-page.ts | 2 +- src/components/select/select.ts | 6 +- src/components/slides/slides.ts | 13 +- src/components/slides/swiper/swiper-a11y.ts | 2 +- .../slides/swiper/swiper-classes.ts | 2 +- .../slides/swiper/swiper-controller.ts | 2 +- .../slides/swiper/swiper-effects.ts | 10 +- src/components/slides/swiper/swiper-events.ts | 22 +- .../slides/swiper/swiper-keyboard.ts | 2 +- .../slides/swiper/swiper-pagination.ts | 2 +- .../slides/swiper/swiper-progress.ts | 2 +- .../slides/swiper/swiper-transition.ts | 2 +- src/components/slides/swiper/swiper-utils.ts | 2 +- src/components/slides/swiper/swiper-zoom.ts | 12 +- src/components/slides/swiper/swiper.ts | 6 +- .../slides/test/basic/app.module.ts | 2 +- .../slides/test/control/app.module.ts | 2 +- .../slides/test/controller/app.module.ts | 2 +- .../slides/test/images/app.module.ts | 2 +- src/components/slides/test/loop/app.module.ts | 2 +- .../slides/test/options/app.module.ts | 2 +- src/components/slides/test/rtl/app.module.ts | 2 +- .../test/basic/pages/components/components.ts | 2 +- src/components/spinner/spinner.ts | 6 +- src/components/split-pane/split-pane.ts | 4 +- src/components/tabs/tab.ts | 2 +- src/components/tabs/tabs.ts | 6 +- .../test/advanced/pages/tabs-page/tabs.ts | 2 +- .../test/basic/pages/tab-three/tab-three.ts | 2 +- src/components/tabs/test/events/app.module.ts | 2 +- src/components/tabs/test/ghost/app.module.ts | 2 +- .../tabs/test/lifecyles/app.module.ts | 2 +- .../test/basic/pages/page-one/page-one.ts | 4 +- src/components/toast/toast.ts | 2 +- src/components/toggle/test/toggle.spec.ts | 4 +- src/components/toggle/toggle-gesture.ts | 2 +- src/components/toggle/toggle.ts | 2 +- src/components/toolbar/toolbar-item.ts | 2 +- src/components/toolbar/toolbar-title.ts | 2 +- .../virtual-scroll/test/basic/app.module.ts | 8 +- .../virtual-scroll/test/cards/app.module.ts | 2 +- .../test/image-gallery/app.module.ts | 6 +- .../test/sliding-item/app.module.ts | 4 +- .../test/variable-size/app.module.ts | 2 +- .../test/virtual-scroll.spec.ts | 10 +- .../virtual-scroll/virtual-scroll.ts | 8 +- src/components/virtual-scroll/virtual-util.ts | 10 +- src/config/config.ts | 2 +- src/gestures/gesture-controller.ts | 2 +- src/gestures/gesture.ts | 2 +- src/gestures/hammer.ts | 10 +- src/gestures/pan-gesture.ts | 12 +- src/gestures/pointer-events.ts | 2 +- src/gestures/slide-gesture.ts | 14 +- src/gestures/ui-event-manager.ts | 2 +- src/module.ts | 8 +- src/navigation/deep-linker.ts | 6 +- src/navigation/ionic-page.ts | 2 +- src/navigation/nav-controller-base.ts | 37 ++- src/navigation/nav-controller.ts | 2 +- src/navigation/nav-util.ts | 2 +- src/navigation/overlay-proxy.ts | 2 +- src/navigation/swipe-back.ts | 6 +- src/navigation/test/deep-linker.spec.ts | 21 +- src/navigation/test/nav-controller.spec.ts | 14 +- src/navigation/test/nav-util.spec.ts | 4 +- src/navigation/test/url-serializer.spec.ts | 6 +- src/navigation/test/view-controller.spec.ts | 20 +- src/navigation/view-controller.ts | 6 +- src/platform/dom-controller.ts | 2 +- src/platform/keyboard.ts | 2 +- src/tap-click/activator.ts | 6 +- src/tap-click/ripple.ts | 4 +- src/tap-click/tap-click.ts | 6 +- src/tap-click/test/activator.spec.ts | 2 +- src/util/base-input.ts | 2 +- src/util/datetime-util.ts | 16 +- src/util/mock-providers.ts | 20 +- src/util/module-loader.ts | 2 +- src/util/scroll-view.ts | 8 +- src/util/test/base-input.spec.ts | 4 +- src/util/test/mock-providers.spec.ts | 5 +- src/util/test/module-loader.spec.ts | 16 +- src/util/util.ts | 10 +- tsconfig.json | 2 + 162 files changed, 626 insertions(+), 470 deletions(-) diff --git a/demos/src/alert/pages/page-one/page-one.ts b/demos/src/alert/pages/page-one/page-one.ts index b25f5b177c..0239fb7bc7 100644 --- a/demos/src/alert/pages/page-one/page-one.ts +++ b/demos/src/alert/pages/page-one/page-one.ts @@ -58,13 +58,13 @@ export class PageOne { buttons: [ { text: 'Cancel', - handler: (data) => { + handler: () => { console.log('Cancel clicked'); } }, { text: 'Save', - handler: (data) => { + handler: () => { console.log('Saved clicked'); } } diff --git a/demos/src/events/app/app.component.ts b/demos/src/events/app/app.component.ts index ab63e01f35..8ebde1f6ef 100644 --- a/demos/src/events/app/app.component.ts +++ b/demos/src/events/app/app.component.ts @@ -26,7 +26,7 @@ export class AppComponent { this.listenToLoginEvents(); } - openPage(menu: any, page: any) { + openPage(_: any, page: any) { // find the nav component and set what the root page should be // reset the nav to remove previous pages and only have this page // we wouldn't want the back button to show in this scenario diff --git a/demos/src/item-sliding/pages/page-one/page-one.ts b/demos/src/item-sliding/pages/page-one/page-one.ts index 0217cd921b..ab90f27d20 100644 --- a/demos/src/item-sliding/pages/page-one/page-one.ts +++ b/demos/src/item-sliding/pages/page-one/page-one.ts @@ -71,7 +71,7 @@ export class PageOne { this.expandAction(item, 'downloading', 'Login was downloaded.'); } - expandAction(item: ItemSliding, action: string, text: string) { + expandAction(item: ItemSliding, _: any, text: string) { // TODO item.setElementClass(action, true); setTimeout(() => { diff --git a/package-lock.json b/package-lock.json index a440df5b90..49898b6574 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,9 +49,9 @@ "integrity": "sha1-LWNyyRh78WIerNlguUs5xPlSk80=" }, "@ionic/app-scripts": { - "version": "1.3.11", - "resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-1.3.11.tgz", - "integrity": "sha512-0CxB9USDjOr+CXHyeFG41nj9CGsFuaBbCqEHQCfCNm1ZTXZVg/VQ3Iv4a7+F5vI+qVRszAr15SO0mYxMYXgZpw==", + "version": "1.3.12", + "resolved": "https://registry.npmjs.org/@ionic/app-scripts/-/app-scripts-1.3.12.tgz", + "integrity": "sha512-aPljLGn3ddN3SkMoeO1e8GA9RPaAy9fKzYD5eWEMYygLnp6Zcsxe2lzTvUiwRyHqDC1JwyTJZ43pTwNzbVLlCQ==", "dev": true, "dependencies": { "fs-extra": { @@ -171,9 +171,9 @@ "dev": true }, "@types/node": { - "version": "6.0.78", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.78.tgz", - "integrity": "sha512-+vD6E8ixntRzzZukoF3uP1iV+ZjVN3koTcaeK+BEoc/kSfGbLDIGC7RmCaUgVpUfN6cWvfczFRERCyKM9mkvXg==", + "version": "6.0.79", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.79.tgz", + "integrity": "sha512-7F3/P6MkTPA0QxOstRqfcnoReCUy5V/QG92cyBoZSPnqdX44L8TtNELSVfN56gAttm3YWj9cEi8FRIPVq0WmeQ==", "dev": true }, "@types/orchestrator": { @@ -375,9 +375,9 @@ "dev": true }, "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz", + "integrity": "sha1-CcIC1ckX7CMYjKpcnLkXnNlUd1A=", "dev": true }, "any-promise": { @@ -572,10 +572,16 @@ "integrity": "sha1-l7yFTH0Ll5+NZIneVHoNF/swf20=", "dev": true, "dependencies": { + "chalk": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", + "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", + "dev": true + }, "postcss": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.3.tgz", - "integrity": "sha1-t/Vls9lW+7hWXKfB4jnQUG5CfYs=", + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.5.tgz", + "integrity": "sha1-76NPdFyiW9Ozy9FapOAxErgjfzw=", "dev": true } } @@ -1575,6 +1581,12 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -1681,6 +1693,18 @@ "integrity": "sha1-KFo/cRVokGUGTWv570Vy22ZpXL8=", "dev": true }, + "color-convert": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", + "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", + "dev": true + }, + "color-name": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz", + "integrity": "sha1-XIq3K2S9IhXWF66VWeuxSEdc+Y0=", + "dev": true + }, "colors": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", @@ -1700,9 +1724,9 @@ "dev": true }, "commander": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.10.0.tgz", - "integrity": "sha512-q/r9trjmuikWDRJNTBHAVnWhuU6w+z80KgBq7j9YDclik5E7X4xi0KnlZBNFA1zOQ+SH/vHMWd2mC9QTOz7GpA==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", "dev": true }, "compare-func": { @@ -2491,9 +2515,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.14", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz", - "integrity": "sha1-ZK8Pnv08PGrNV9cfg7Scp+6cS0M=", + "version": "1.3.15", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz", + "integrity": "sha1-CDl5NIkcvPrrvRi4KpW1pIETg2k=", "dev": true }, "elliptic": { @@ -2631,9 +2655,9 @@ } }, "enhanced-resolve": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz", - "integrity": "sha1-n0tib1dyRe3PSyrYPYbhf09CHew=", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz", + "integrity": "sha512-2qbxE7ek3YxPJ1ML6V+satHkzHpJQKWkRHmRx6mfAoW59yP8YH8BFplbegSP+u2hBd6B6KCOpvJQ3dZAP+hkpg==", "dev": true }, "ent": { @@ -4721,10 +4745,60 @@ "dev": true }, "gulp-tslint": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-6.1.1.tgz", - "integrity": "sha1-ruRSi9mGomGdv9dkL45fYVbfVk4=", - "dev": true + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-8.1.1.tgz", + "integrity": "sha1-GpBuWfrK6s2pAPO0ErD0bPsKuJ8=", + "dev": true, + "dependencies": { + "clone": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", + "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=", + "dev": true + }, + "dateformat": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz", + "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=", + "dev": true + }, + "gulp-util": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", + "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", + "dev": true + }, + "lodash.template": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "dev": true + }, + "lodash.templatesettings": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", + "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", + "dev": true + }, + "map-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", + "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=", + "dev": true + }, + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", + "dev": true + }, + "vinyl": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", + "dev": true + } + } }, "gulp-typescript": { "version": "2.13.6", @@ -5011,9 +5085,9 @@ "dev": true }, "hash.js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.2.tgz", - "integrity": "sha512-SsNl8Ro2uz5xUTRYq8ysWzX8B7jCj7pLvX3opktaI6ZrTT2YElqjFVJXHJZe+5Aby20c9UC7elCjJDe1dhTaAw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", + "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", "dev": true }, "hawk": { @@ -5077,9 +5151,9 @@ "dev": true, "dependencies": { "clean-css": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.4.tgz", - "integrity": "sha1-7siBHbJ0V+AHjYypIfqBty+oK/Q=", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.5.tgz", + "integrity": "sha1-0JqHoCpTdRF1iXlq52oGPKzbVBo=", "dev": true }, "commander": { @@ -5089,9 +5163,9 @@ "dev": true }, "uglify-js": { - "version": "3.0.21", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.21.tgz", - "integrity": "sha512-45X9x/RpsT3CXstNF12rR5Il9rGVFv1dcF7H2fFzhsRO8uRxON04jLjBcIO8buH5AbeiYDR04yTbyu+MHRXNUQ==", + "version": "3.0.23", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.23.tgz", + "integrity": "sha512-miLHbO2QcdQGxL/q1wLcUr6TGIRHhMnpKyywUbAdZRkJMqCeZCDmBsgYu1Wlj26xHBXN+sU5tHaWh38QsN208g==", "dev": true } } @@ -5426,9 +5500,9 @@ "dev": true, "dependencies": { "isobject": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.0.tgz", - "integrity": "sha1-OVZSF/NmF4nooKDAgNX35rxG4aA=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true } } @@ -5706,9 +5780,9 @@ "dev": true }, "js-tokens": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz", - "integrity": "sha1-COnxMkhKLEWjCQfp3E1VZ7fxFNc=", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", "dev": true }, "js-yaml": { @@ -6970,9 +7044,9 @@ "dev": true }, "isobject": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.0.tgz", - "integrity": "sha1-OVZSF/NmF4nooKDAgNX35rxG4aA=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true } } @@ -7616,9 +7690,9 @@ "dev": true }, "readable-stream": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.2.tgz", - "integrity": "sha1-WgTfBeT1f+Pw3Gj90R3FyXx+b00=", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", "dev": true }, "readdirp": { @@ -8976,9 +9050,9 @@ "dev": true }, "supports-color": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz", - "integrity": "sha1-M6fGgKpRLJ0D75KcrLuXTSA9J5A=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.1.0.tgz", + "integrity": "sha1-kswUuz2tiSjKVlbDPhmhnyCvXHo=", "dev": true }, "sw-toolbox": { @@ -9278,15 +9352,21 @@ "dev": true }, "tslint": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-3.15.1.tgz", - "integrity": "sha1-2hZcqT2P3CwIa1EWXuG6y0jJjqU=", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.4.3.tgz", + "integrity": "sha1-dhyEArgONHt3M6BDkKdXslNYBGc=", "dev": true, "dependencies": { - "diff": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz", - "integrity": "sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k=", + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true + }, + "tsutils": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.5.1.tgz", + "integrity": "sha1-wgATkMee7Bpcz6esEtWZY5aD4M8=", "dev": true } } @@ -9298,18 +9378,10 @@ "dev": true }, "tslint-ionic-rules": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/tslint-ionic-rules/-/tslint-ionic-rules-0.0.8.tgz", - "integrity": "sha1-au1vjjzUBlIzAdHW0Db38DbdKAk=", - "dev": true, - "dependencies": { - "tslint-eslint-rules": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-1.6.1.tgz", - "integrity": "sha1-OekvMZVq0qZsAGHDUfqWwICK4Pg=", - "dev": true - } - } + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/tslint-ionic-rules/-/tslint-ionic-rules-0.0.11.tgz", + "integrity": "sha512-EP4/Vgv0Zl66T8dqZe6LV3g+aWpGCSBxHKfScbiFh3kQKE3cikGEEYCLu1vR5yhjvm5DveWFUobwEFiwlts0hw==", + "dev": true }, "tsscmp": { "version": "1.0.5", @@ -9446,12 +9518,6 @@ "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=", "dev": true }, - "underscore.string": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz", - "integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=", - "dev": true - }, "unique-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", diff --git a/package.json b/package.json index 1130b957e6..f151575ae0 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "gulp-scss-lint": "0.4.0", "gulp-shell": "0.5.2", "gulp-strip-debug": "1.1.0", - "gulp-tslint": "6.1.1", + "gulp-tslint": "^8.1.1", "gulp-typescript": "2.13.6", "gulp-uglify": "2.0.0", "gulp-util": "3.0.7", @@ -131,8 +131,8 @@ "systemjs": "0.19.38", "through2": "2.0.1", "ts-node": "1.3.0", - "tslint": "3.15.1", - "tslint-ionic-rules": "0.0.8", + "tslint": "^5.4.3", + "tslint-ionic-rules": "0.0.11", "typescript": "~2.3.3", "vinyl": "1.2.0", "webpack": "^2.1.0-beta.27", diff --git a/src/animations/animation.ts b/src/animations/animation.ts index 8f1494719c..956a0df5b2 100644 --- a/src/animations/animation.ts +++ b/src/animations/animation.ts @@ -1,7 +1,6 @@ -import { isDefined, assert } from '../util/util'; +import { assert, isDefined } from '../util/util'; import { Platform } from '../platform/platform'; - /** * @hidden */ @@ -48,12 +47,12 @@ export class Animation { if (ele) { if (typeof ele === 'string') { ele = this.plt.doc().querySelectorAll(ele); - for (var i = 0; i < ele.length; i++) { + for (let i = 0; i < ele.length; i++) { this._addEle(ele[i]); } } else if (ele.length) { - for (var i = 0; i < ele.length; i++) { + for (let i = 0; i < ele.length; i++) { this._addEle(ele[i]); } @@ -194,7 +193,7 @@ export class Animation { if (!fxProp) { // first time we've see this EffectProperty - var shouldTrans = (ANIMATION_TRANSFORMS[prop] === 1); + const shouldTrans = (ANIMATION_TRANSFORMS[prop] === 1); fxProp = { name: prop, trans: shouldTrans, @@ -262,7 +261,7 @@ export class Animation { */ beforeClearStyles(propertyNames: string[]): Animation { this._bfSty = this._bfSty || {}; - for (var i = 0; i < propertyNames.length; i++) { + for (let i = 0; i < propertyNames.length; i++) { this._bfSty[propertyNames[i]] = ''; } return this; @@ -319,7 +318,7 @@ export class Animation { */ afterClearStyles(propertyNames: string[]): Animation { this._afSty = this._afSty || {}; - for (var i = 0; i < propertyNames.length; i++) { + for (let i = 0; i < propertyNames.length; i++) { this._afSty[propertyNames[i]] = ''; } return this; @@ -386,7 +385,7 @@ export class Animation { this._hasDur = (this.getDuration(opts) > ANIMATION_DURATION_MIN); const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { // ******** DOM WRITE **************** children[i]._playInit(opts); } @@ -441,7 +440,7 @@ export class Animation { */ _playProgress(opts: PlayOptions) { const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { // ******** DOM WRITE **************** children[i]._playProgress(opts); } @@ -474,7 +473,7 @@ export class Animation { */ _playToStep(stepValue: number) { const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { // ******** DOM WRITE **************** children[i]._playToStep(stepValue); } @@ -546,7 +545,7 @@ export class Animation { */ _playEnd(stepValue?: number) { const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { // ******** DOM WRITE **************** children[i]._playEnd(stepValue); } @@ -583,7 +582,7 @@ export class Animation { } const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { if (children[i]._hasDuration(opts)) { return true; } @@ -602,7 +601,7 @@ export class Animation { } const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { if (children[i]._hasDomReads()) { return true; } @@ -650,16 +649,16 @@ export class Animation { if (this._rv) { stepValue = ((stepValue * -1) + 1); } - var i: number, j: number; - var finalTransform: string = ''; - var elements = this._e; + let i: number, j: number; + let finalTransform: string = ''; + const elements = this._e; for (i = 0; i < effects.length; i++) { - var fx = effects[i]; + const fx = effects[i]; if (fx.from && fx.to) { - var fromNum = fx.from.num; - var toNum = fx.to.num; - var tweenEffect = (fromNum !== toNum); + const fromNum = fx.from.num; + const toNum = fx.to.num; + const tweenEffect = (fromNum !== toNum); assert(tweenEffect || !this._isAsync, 'in async animations to != from value'); if (tweenEffect) { @@ -676,8 +675,8 @@ export class Animation { } else if (tweenEffect) { // EVERYTHING IN BETWEEN - var valNum = (((toNum - fromNum) * stepValue) + fromNum); - var unit = fx.to.unit; + let valNum = (((toNum - fromNum) * stepValue) + fromNum); + const unit = fx.to.unit; if (unit === 'px') { valNum = Math.round(valNum); } @@ -685,7 +684,7 @@ export class Animation { } if (val !== null) { - var prop = fx.name; + const prop = fx.name; if (fx.trans) { finalTransform += prop + '(' + val + ') '; @@ -705,7 +704,7 @@ export class Animation { finalTransform += 'translateZ(0px)'; } - var cssTransform = this.plt.Css.transform; + const cssTransform = this.plt.Css.transform; for (i = 0; i < elements.length; i++) { // ******** DOM WRITE **************** (elements[i].style)[cssTransform] = finalTransform; @@ -734,7 +733,7 @@ export class Animation { const cssTransitionTimingFn = Css.transitionTimingFn; let eleStyle: any; - for (var i = 0; i < this._eL; i++) { + for (let i = 0; i < this._eL; i++) { eleStyle = elements[i].style; if (dur > 0) { // ******** DOM WRITE **************** @@ -836,14 +835,14 @@ export class Animation { */ _fireBeforeReadFunc() { const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { // ******** DOM READ **************** children[i]._fireBeforeReadFunc(); } const readFunctions = this._rdFn; if (readFunctions) { - for (var i = 0; i < readFunctions.length; i++) { + for (let i = 0; i < readFunctions.length; i++) { // ******** DOM READ **************** readFunctions[i](); } @@ -857,14 +856,14 @@ export class Animation { */ _fireBeforeWriteFunc() { const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { // ******** DOM WRITE **************** children[i]._fireBeforeWriteFunc(); } const writeFunctions = this._wrFn; if (this._wrFn) { - for (var i = 0; i < writeFunctions.length; i++) { + for (let i = 0; i < writeFunctions.length; i++) { // ******** DOM WRITE **************** writeFunctions[i](); } @@ -909,7 +908,7 @@ export class Animation { // inline styles that were added before the animation should be removed if (this._bfSty) { - for (var prop in this._bfSty) { + for (const prop in this._bfSty) { // ******** DOM WRITE **************** (ele).style[prop] = ''; } @@ -936,7 +935,7 @@ export class Animation { // inline styles to add after the animation if (this._afSty) { - for (var prop in this._afSty) { + for (const prop in this._afSty) { // ******** DOM WRITE **************** (ele).style[prop] = this._afSty[prop]; } @@ -956,8 +955,8 @@ export class Animation { let willChange: string; if (addWillChange && effects) { wc = []; - for (var i = 0; i < effects.length; i++) { - var propWC = effects[i].wc; + for (let i = 0; i < effects.length; i++) { + const propWC = effects[i].wc; if (propWC === 'webkitTransform') { wc.push('transform', '-webkit-transform'); @@ -969,7 +968,7 @@ export class Animation { } else { willChange = ''; } - for (var i = 0; i < this._eL; i++) { + for (let i = 0; i < this._eL; i++) { // ******** DOM WRITE **************** (this._e[i]).style.willChange = willChange; } @@ -996,7 +995,7 @@ export class Animation { */ _progressStart() { const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { // ******** DOM WRITE **************** children[i]._progressStart(); } @@ -1017,7 +1016,7 @@ export class Animation { stepValue = Math.min(1, Math.max(0, stepValue)); const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { // ******** DOM WRITE **************** children[i].progressStep(stepValue); } @@ -1076,7 +1075,7 @@ export class Animation { */ _progressEnd(shouldComplete: boolean, stepValue: number, dur: number, isAsync: boolean) { const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { // ******** DOM WRITE **************** children[i]._progressEnd(shouldComplete, stepValue, dur, isAsync); } @@ -1127,7 +1126,7 @@ export class Animation { */ _didFinishAll(hasCompleted: boolean, finishAsyncAnimations: boolean, finishNoDurationAnimations: boolean) { const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { children[i]._didFinishAll(hasCompleted, finishAsyncAnimations, finishNoDurationAnimations); } @@ -1146,14 +1145,14 @@ export class Animation { if (this._fFn) { // run all finish callbacks - for (var i = 0; i < this._fFn.length; i++) { + for (let i = 0; i < this._fFn.length; i++) { this._fFn[i](this); } } if (this._fOneFn) { // run all "onetime" finish callbacks - for (var i = 0; i < this._fOneFn.length; i++) { + for (let i = 0; i < this._fOneFn.length; i++) { this._fOneFn[i](this); } this._fOneFn.length = 0; @@ -1165,7 +1164,7 @@ export class Animation { */ reverse(shouldReverse: boolean = true): Animation { const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { children[i].reverse(shouldReverse); } this._rv = shouldReverse; @@ -1177,7 +1176,7 @@ export class Animation { */ destroy() { const children = this._c; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { children[i].destroy(); } @@ -1202,9 +1201,9 @@ export class Animation { */ _transEl(): HTMLElement { // get the lowest level element that has an Animation - var targetEl: HTMLElement; + let targetEl: HTMLElement; - for (var i = 0; i < this._cL; i++) { + for (let i = 0; i < this._cL; i++) { targetEl = this._c[i]._transEl(); if (targetEl) { return targetEl; diff --git a/src/components/action-sheet/action-sheet-component.ts b/src/components/action-sheet/action-sheet-component.ts index 052f77c981..09240908b8 100644 --- a/src/components/action-sheet/action-sheet-component.ts +++ b/src/components/action-sheet/action-sheet-component.ts @@ -1,11 +1,10 @@ import { Component, ElementRef, HostListener, Renderer, ViewEncapsulation } from '@angular/core'; -import { ActionSheetOptions, ActionSheetButton } from './action-sheet-options'; +import { ActionSheetButton, ActionSheetOptions } from './action-sheet-options'; import { assert } from '../../util/util'; -import { BlockerDelegate, GestureController, BLOCK_ALL } from '../../gestures/gesture-controller'; +import { BLOCK_ALL, BlockerDelegate, GestureController } from '../../gestures/gesture-controller'; import { Config } from '../../config/config'; import { KEY_ESCAPE } from '../../platform/key'; -import { Platform } from '../../platform/platform'; import { NavParams } from '../../navigation/nav-params'; import { NavOptions } from '../../navigation/nav-util'; import { ViewController } from '../../navigation/view-controller'; @@ -57,7 +56,6 @@ export class ActionSheetCmp { constructor( private _viewCtrl: ViewController, config: Config, - private _plt: Platform, private _elementRef: ElementRef, gestureCtrl: GestureController, params: NavParams, diff --git a/src/components/action-sheet/action-sheet-options.ts b/src/components/action-sheet/action-sheet-options.ts index 6ff277df9a..a4ae6a76a4 100644 --- a/src/components/action-sheet/action-sheet-options.ts +++ b/src/components/action-sheet/action-sheet-options.ts @@ -13,4 +13,4 @@ export interface ActionSheetButton { icon?: string; cssClass?: string; handler?: () => boolean|void; -}; +} diff --git a/src/components/action-sheet/action-sheet.ts b/src/components/action-sheet/action-sheet.ts index da6c57458b..0e6bdabe51 100644 --- a/src/components/action-sheet/action-sheet.ts +++ b/src/components/action-sheet/action-sheet.ts @@ -1,6 +1,6 @@ import { ActionSheetCmp } from './action-sheet-component'; -import { ActionSheetOptions, ActionSheetButton } from './action-sheet-options'; -import { ActionSheetSlideIn, ActionSheetMdSlideIn, ActionSheetSlideOut, ActionSheetMdSlideOut, ActionSheetWpSlideIn, ActionSheetWpSlideOut } from './action-sheet-transitions'; +import { ActionSheetButton, ActionSheetOptions } from './action-sheet-options'; +import { ActionSheetMdSlideIn, ActionSheetMdSlideOut, ActionSheetSlideIn, ActionSheetSlideOut, ActionSheetWpSlideIn, ActionSheetWpSlideOut } from './action-sheet-transitions'; import { App } from '../app/app'; import { Config } from '../../config/config'; import { isPresent } from '../../util/util'; diff --git a/src/components/alert/alert-component.ts b/src/components/alert/alert-component.ts index 3a58732456..1bd9cdeb33 100644 --- a/src/components/alert/alert-component.ts +++ b/src/components/alert/alert-component.ts @@ -2,14 +2,14 @@ import { Component, ElementRef, HostListener, Renderer, ViewEncapsulation } from import { Config } from '../../config/config'; import { NON_TEXT_INPUT_REGEX } from '../../util/dom'; -import { GestureController, BlockerDelegate, BLOCK_ALL } from '../../gestures/gesture-controller'; -import { isPresent, assert } from '../../util/util'; +import { BLOCK_ALL, BlockerDelegate, GestureController } from '../../gestures/gesture-controller'; +import { assert, isPresent } from '../../util/util'; import { KEY_ENTER, KEY_ESCAPE } from '../../platform/key'; import { NavParams } from '../../navigation/nav-params'; import { NavOptions } from '../../navigation/nav-util'; import { Platform } from '../../platform/platform'; import { ViewController } from '../../navigation/view-controller'; -import { AlertInputOptions, AlertOptions, AlertButton } from './alert-options'; +import { AlertButton, AlertInputOptions, AlertOptions } from './alert-options'; /** diff --git a/src/components/alert/alert-options.ts b/src/components/alert/alert-options.ts index 454b895ca6..dddded8106 100644 --- a/src/components/alert/alert-options.ts +++ b/src/components/alert/alert-options.ts @@ -29,4 +29,4 @@ export interface AlertButton { role?: string; cssClass?: string; handler?: (value: any) => boolean|void; -}; +} diff --git a/src/components/alert/alert.ts b/src/components/alert/alert.ts index 8ab31945a8..ade9a59ae9 100644 --- a/src/components/alert/alert.ts +++ b/src/components/alert/alert.ts @@ -1,7 +1,7 @@ import { App } from '../app/app'; import { AlertCmp } from './alert-component'; -import { AlertOptions, AlertInputOptions, AlertButton } from './alert-options'; -import { AlertPopIn, AlertPopOut, AlertMdPopIn, AlertMdPopOut, AlertWpPopIn, AlertWpPopOut } from './alert-transitions'; +import { AlertButton, AlertInputOptions, AlertOptions } from './alert-options'; +import { AlertMdPopIn, AlertMdPopOut, AlertPopIn, AlertPopOut, AlertWpPopIn, AlertWpPopOut } from './alert-transitions'; import { Config } from '../../config/config'; import { isPresent } from '../../util/util'; import { NavOptions } from '../../navigation/nav-util'; diff --git a/src/components/alert/test/dismiss/app.module.ts b/src/components/alert/test/dismiss/app.module.ts index c901155b36..fea4388f38 100644 --- a/src/components/alert/test/dismiss/app.module.ts +++ b/src/components/alert/test/dismiss/app.module.ts @@ -1,6 +1,6 @@ import { Component, NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { IonicApp, IonicModule, AlertController, LoadingController, NavController } from '../../../..'; +import { AlertController, IonicApp, IonicModule, LoadingController, NavController } from '../../../..'; import { FormBuilder, Validators } from '@angular/forms'; diff --git a/src/components/app/app.ts b/src/components/app/app.ts index bfc93201cc..b004c95bd2 100644 --- a/src/components/app/app.ts +++ b/src/components/app/app.ts @@ -1,12 +1,12 @@ import { EventEmitter, Injectable, Optional } from '@angular/core'; -import { Title, DOCUMENT } from '@angular/platform-browser'; +import { DOCUMENT, Title } from '@angular/platform-browser'; import { IonicApp } from './app-root'; import * as Constants from './app-constants'; import { ClickBlock } from './click-block'; -import { runInDev, assert } from '../../util/util'; +import { assert, runInDev } from '../../util/util'; import { Config } from '../../config/config'; -import { NavOptions, DIRECTION_FORWARD, DIRECTION_BACK, isTabs } from '../../navigation/nav-util'; +import { DIRECTION_BACK, DIRECTION_FORWARD, NavOptions, isTabs } from '../../navigation/nav-util'; import { MenuController } from './menu-controller'; import { NavigationContainer } from '../../navigation/navigation-container'; import { NavControllerBase } from '../../navigation/nav-controller-base'; @@ -355,9 +355,10 @@ export class App { platform.registerListener(platform.doc(), 'focusin', onFocusin, { capture: true, zone: false, passive: true }); platform.registerListener(platform.doc(), 'touchend', onTouchend, { capture: false, zone: false, passive: true }); - function onFocusin(ev: any) { + function onFocusin() { focused = true; } + function onTouchend(ev: any) { // if app did scroll return early if (self._didScroll) { diff --git a/src/components/app/click-block.ts b/src/components/app/click-block.ts index 92a8f8bdef..f71c9d804b 100644 --- a/src/components/app/click-block.ts +++ b/src/components/app/click-block.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, forwardRef, Inject, Renderer } from '@angular/core'; +import { Directive, ElementRef, Inject, Renderer, forwardRef } from '@angular/core'; import { App } from '../app/app'; import { Config } from '../../config/config'; diff --git a/src/components/app/menu-controller.ts b/src/components/app/menu-controller.ts index 275c8da1a5..896e06a0c0 100644 --- a/src/components/app/menu-controller.ts +++ b/src/components/app/menu-controller.ts @@ -1,6 +1,6 @@ import { Menu, MenuType } from './menu-interface'; import { Platform } from '../../platform/platform'; -import { removeArrayItem, assert } from '../../util/util'; +import { assert, removeArrayItem } from '../../util/util'; /** diff --git a/src/components/app/menu-interface.ts b/src/components/app/menu-interface.ts index 1d3d011f03..6eeaf345c8 100644 --- a/src/components/app/menu-interface.ts +++ b/src/components/app/menu-interface.ts @@ -27,7 +27,7 @@ export interface Menu { getBackdropElement(): HTMLElement; _canOpen(): boolean; persistent: boolean; -}; +} export interface MenuType { ani: Animation; @@ -37,4 +37,4 @@ export interface MenuType { setProgessStep(stepValue: number): void; setProgressEnd(shouldComplete: boolean, currentStepValue: number, velocity: number, done: Function): void; destroy(): void; -}; +} diff --git a/src/components/app/overlay-portal.ts b/src/components/app/overlay-portal.ts index a1dcf217ff..db5d14d2db 100644 --- a/src/components/app/overlay-portal.ts +++ b/src/components/app/overlay-portal.ts @@ -1,4 +1,4 @@ -import { ComponentFactoryResolver, Directive, ElementRef, ErrorHandler, forwardRef, Inject, Input, NgZone, Optional, Renderer, ViewContainerRef } from '@angular/core'; +import { ComponentFactoryResolver, Directive, ElementRef, ErrorHandler, Inject, Input, NgZone, Optional, Renderer, ViewContainerRef, forwardRef } from '@angular/core'; import { App } from './app'; import { Config } from '../../config/config'; diff --git a/src/components/app/test/app.spec.ts b/src/components/app/test/app.spec.ts index d3f37eee8b..d8c0b281cf 100644 --- a/src/components/app/test/app.spec.ts +++ b/src/components/app/test/app.spec.ts @@ -1,7 +1,7 @@ import { App } from '../app'; import { ClickBlock } from '../click-block'; import { Config } from '../../../config/config'; -import { mockApp, mockConfig, mockElementRef, mockNavController, mockPlatform, MockPlatform, mockRenderer, mockTab, mockTabs, mockView, mockViews } from '../../../util/mock-providers'; +import { MockPlatform, mockApp, mockConfig, mockElementRef, mockNavController, mockPlatform, mockRenderer, mockTab, mockTabs, mockView, mockViews } from '../../../util/mock-providers'; import { OverlayPortal } from '../overlay-portal'; import { PORTAL_MODAL } from '../app-constants'; diff --git a/src/components/checkbox/test/checkbox.spec.ts b/src/components/checkbox/test/checkbox.spec.ts index 4c957b230a..0207f2a231 100644 --- a/src/components/checkbox/test/checkbox.spec.ts +++ b/src/components/checkbox/test/checkbox.spec.ts @@ -1,7 +1,7 @@ import { Checkbox } from '../checkbox'; -import { mockConfig, mockElementRef, mockRenderer, mockItem } from '../../../util/mock-providers'; -import { commonInputTest, BOOLEAN_CORPUS } from '../../../util/input-tester'; +import { mockConfig, mockElementRef, mockItem, mockRenderer } from '../../../util/mock-providers'; +import { BOOLEAN_CORPUS, commonInputTest } from '../../../util/input-tester'; describe('Checkbox', () => { diff --git a/src/components/content/content.ts b/src/components/content/content.ts index df4708e169..1af7e61e3e 100644 --- a/src/components/content/content.ts +++ b/src/components/content/content.ts @@ -6,12 +6,12 @@ import { DomController } from '../../platform/dom-controller'; import { Img } from '../img/img-interface'; import { Ion } from '../ion'; import { isTabs } from '../../navigation/nav-util'; -import { isTrueProperty, assert, removeArrayItem } from '../../util/util'; +import { assert, isTrueProperty, removeArrayItem } from '../../util/util'; import { Keyboard } from '../../platform/keyboard'; import { NavController } from '../../navigation/nav-controller'; import { Content as IContent, Tabs } from '../../navigation/nav-interfaces'; import { Platform } from '../../platform/platform'; -import { ScrollView, ScrollEvent } from '../../util/scroll-view'; +import { ScrollEvent, ScrollView } from '../../util/scroll-view'; import { ViewController } from '../../navigation/view-controller'; export { ScrollEvent } from '../../util/scroll-view'; diff --git a/src/components/datetime/datetime.ts b/src/components/datetime/datetime.ts index 00b7ec47df..1adce76ee0 100644 --- a/src/components/datetime/datetime.ts +++ b/src/components/datetime/datetime.ts @@ -8,8 +8,23 @@ import { PickerColumn } from '../picker/picker-options'; import { Form } from '../../util/form'; import { BaseInput } from '../../util/base-input'; import { Item } from '../item/item'; -import { deepCopy, isBlank, isPresent, isArray, isObject, isString, assert, clamp } from '../../util/util'; -import { dateValueRange, renderDateTime, renderTextFormat, convertDataToISO, convertFormatToKey, getValueFromFormat, parseTemplate, parseDate, updateDate, DateTimeData, daysInMonth, dateSortValue, dateDataSortValue, LocaleData } from '../../util/datetime-util'; +import { assert, clamp, deepCopy, isArray, isBlank, isObject, isPresent, isString } from '../../util/util'; +import { + DateTimeData, + LocaleData, + convertDataToISO, + convertFormatToKey, + dateDataSortValue, + dateSortValue, + dateValueRange, + daysInMonth, + getValueFromFormat, + parseDate, + parseTemplate, + renderDateTime, + renderTextFormat, + updateDate, +} from '../../util/datetime-util'; /** * @name DateTime diff --git a/src/components/datetime/test/datetime.spec.ts b/src/components/datetime/test/datetime.spec.ts index 235ed4b7eb..5b407654f7 100644 --- a/src/components/datetime/test/datetime.spec.ts +++ b/src/components/datetime/test/datetime.spec.ts @@ -90,7 +90,7 @@ describe('DateTime', () => { columns[0].selectedIndex = 1; // February datetime.validate(); - for (var i = 0; i < 28; i++) { + for (let i = 0; i < 28; i++) { expect(columns[1].options[i].disabled).toEqual(false); } expect(columns[1].options[28].disabled).toEqual(true); @@ -100,7 +100,7 @@ describe('DateTime', () => { columns[0].selectedIndex = 3; // April datetime.validate(); - for (var i = 0; i < 30; i++) { + for (let i = 0; i < 30; i++) { expect(columns[1].options[i].disabled).toEqual(false); } expect(columns[1].options[30].disabled).toEqual(true); @@ -130,7 +130,7 @@ describe('DateTime', () => { } // // Days - for (var i = 0; i < columns[1].options.length; i++) { + for (let i = 0; i < columns[1].options.length; i++) { expect(columns[1].options[i].disabled).toEqual(false); } diff --git a/src/components/fab/fab-list.ts b/src/components/fab/fab-list.ts index f5b9c5bbb1..d5cfbfffdb 100644 --- a/src/components/fab/fab-list.ts +++ b/src/components/fab/fab-list.ts @@ -1,4 +1,4 @@ -import { ContentChildren, QueryList, Directive, ElementRef, Renderer } from '@angular/core'; +import { ContentChildren, Directive, ElementRef, QueryList, Renderer } from '@angular/core'; import { Config } from '../../config/config'; import { isTrueProperty } from '../../util/util'; diff --git a/src/components/fab/fab.ts b/src/components/fab/fab.ts index 2e6ba65fce..e6129969bb 100755 --- a/src/components/fab/fab.ts +++ b/src/components/fab/fab.ts @@ -1,4 +1,4 @@ -import { Component, ChangeDetectionStrategy, ElementRef, Renderer, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ElementRef, Renderer, ViewEncapsulation } from '@angular/core'; import { Config } from '../../config/config'; import { Ion } from '../ion'; diff --git a/src/components/img/img-interface.ts b/src/components/img/img-interface.ts index 6d46381dfc..33fe81a445 100644 --- a/src/components/img/img-interface.ts +++ b/src/components/img/img-interface.ts @@ -6,4 +6,4 @@ export interface Img { canRequest: boolean; reset(): void; update(): void; -}; +} diff --git a/src/components/infinite-scroll/test/basic/app.module.ts b/src/components/infinite-scroll/test/basic/app.module.ts index f4ff1d6721..c037ba2d22 100644 --- a/src/components/infinite-scroll/test/basic/app.module.ts +++ b/src/components/infinite-scroll/test/basic/app.module.ts @@ -1,6 +1,6 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; +import { Component, NgModule, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { IonicApp, IonicModule, InfiniteScroll, NavController } from '../../../..'; +import { InfiniteScroll, IonicApp, IonicModule, NavController } from '../../../..'; @Component({ diff --git a/src/components/infinite-scroll/test/short-list/app.module.ts b/src/components/infinite-scroll/test/short-list/app.module.ts index df16bac150..3741a73485 100644 --- a/src/components/infinite-scroll/test/short-list/app.module.ts +++ b/src/components/infinite-scroll/test/short-list/app.module.ts @@ -1,6 +1,6 @@ import { Component, NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { IonicApp, IonicModule, InfiniteScroll } from '../../../..'; +import { InfiniteScroll, IonicApp, IonicModule } from '../../../..'; @Component({ diff --git a/src/components/input/input.ts b/src/components/input/input.ts index d0e364edc8..7c02a69320 100644 --- a/src/components/input/input.ts +++ b/src/components/input/input.ts @@ -1,6 +1,14 @@ import { - Component, ChangeDetectionStrategy, Optional, ElementRef, EventEmitter, - Input, Output, Renderer, ViewChild, ViewEncapsulation + ChangeDetectionStrategy, + Component, + ElementRef, + EventEmitter, + Input, + Optional, + Output, + Renderer, + ViewChild, + ViewEncapsulation } from '@angular/core'; import { NgControl } from '@angular/forms'; @@ -14,7 +22,7 @@ import { copyInputAttributes, hasPointerMoved, pointerCoord } from '../../util/ import { DomController } from '../../platform/dom-controller'; import { Form, IonicFormInput } from '../../util/form'; import { BaseInput } from '../../util/base-input'; -import { isTrueProperty, assert } from '../../util/util'; +import { assert, isTrueProperty } from '../../util/util'; import { Item } from '../item/item'; import { Platform } from '../../platform/platform'; @@ -250,16 +258,16 @@ export class TextInput extends BaseInput implements IonicFormInput { constructor( config: Config, private _plt: Platform, - private form: Form, + _form: Form, private _app: App, elementRef: ElementRef, renderer: Renderer, @Optional() private _content: Content, - @Optional() private item: Item, + @Optional() _item: Item, @Optional() public ngControl: NgControl, private _dom: DomController ) { - super(config, elementRef, renderer, 'input', '', form, item, ngControl); + super(config, elementRef, renderer, 'input', '', _form, _item, ngControl); this.autocomplete = config.get('autocomplete', 'off'); this.autocorrect = config.get('autocorrect', 'off'); @@ -267,8 +275,8 @@ export class TextInput extends BaseInput implements IonicFormInput { this._keyboardHeight = config.getNumber('keyboardHeight'); this._isTextarea = !!(elementRef.nativeElement.tagName === 'ION-TEXTAREA'); - if (this._isTextarea && item) { - item.setElementClass('item-textarea', true); + if (this._isTextarea && _item) { + _item.setElementClass('item-textarea', true); } // If not inside content, let's disable all the hacks if (!_content) { @@ -450,7 +458,7 @@ export class TextInput extends BaseInput implements IonicFormInput { * Check if we need to clear the text input if clearOnEdit is enabled * @hidden */ - checkClearOnEdit(inputValue: string) { + checkClearOnEdit(_: string) { if (!this._clearOnEdit) { return; } diff --git a/src/components/input/test/form-inputs/pages/root-page/root-page.ts b/src/components/input/test/form-inputs/pages/root-page/root-page.ts index 3b1a44bf7f..9c3a7983dd 100644 --- a/src/components/input/test/form-inputs/pages/root-page/root-page.ts +++ b/src/components/input/test/form-inputs/pages/root-page/root-page.ts @@ -47,7 +47,7 @@ export class RootPage { } } - submit(ev: UIEvent, value?: any) { + submit(_: UIEvent, value?: any) { console.log('Submitted', value); this.submitted = true; } diff --git a/src/components/input/test/highlight/pages/root-page/root-page.ts b/src/components/input/test/highlight/pages/root-page/root-page.ts index ea09d64ffe..688869672a 100644 --- a/src/components/input/test/highlight/pages/root-page/root-page.ts +++ b/src/components/input/test/highlight/pages/root-page/root-page.ts @@ -38,7 +38,7 @@ export class RootPage { } } - submit(ev: UIEvent, value: any) { + submit(_: UIEvent, value: any) { console.log('Submitted', value); this.submitted = true; } diff --git a/src/components/input/test/text-input.spec.ts b/src/components/input/test/text-input.spec.ts index d9442aa0f8..589dd47ba1 100644 --- a/src/components/input/test/text-input.spec.ts +++ b/src/components/input/test/text-input.spec.ts @@ -1,7 +1,7 @@ -import { getScrollData, TextInput } from '../input'; +import { TextInput, getScrollData } from '../input'; import { ContentDimensions } from '../../content/content'; -import { mockConfig, mockApp, mockPlatform, mockDomController, mockElementRef, mockElementRefEle, mockRenderer, mockItem, mockForm } from '../../../util/mock-providers'; -import { commonInputTest, TEXT_CORPUS } from '../../../util/input-tester'; +import { mockApp, mockConfig, mockDomController, mockElementRef, mockElementRefEle, mockForm, mockItem, mockPlatform, mockRenderer } from '../../../util/mock-providers'; +import { TEXT_CORPUS, commonInputTest } from '../../../util/input-tester'; function newInput(): TextInput { diff --git a/src/components/ion.ts b/src/components/ion.ts index a3bb9a102b..096850be2b 100644 --- a/src/components/ion.ts +++ b/src/components/ion.ts @@ -1,4 +1,4 @@ -import { ElementRef, Renderer, Input } from '@angular/core'; +import { ElementRef, Input, Renderer } from '@angular/core'; import { Config } from '../config/config'; diff --git a/src/components/item/item-reorder-gesture.ts b/src/components/item/item-reorder-gesture.ts index 238ef9aa2a..f3d9df1b42 100644 --- a/src/components/item/item-reorder-gesture.ts +++ b/src/components/item/item-reorder-gesture.ts @@ -1,4 +1,4 @@ -import { indexForItem, findReorderItem } from './item-reorder-util'; +import { findReorderItem, indexForItem } from './item-reorder-util'; import { Platform } from '../../platform/platform'; import { PointerCoordinates, pointerCoord } from '../../util/dom'; import { UIEventManager } from '../../gestures/ui-event-manager'; diff --git a/src/components/item/item-reorder.ts b/src/components/item/item-reorder.ts index d21cb23873..09d1ccab15 100644 --- a/src/components/item/item-reorder.ts +++ b/src/components/item/item-reorder.ts @@ -1,9 +1,9 @@ -import { Directive, ElementRef, EventEmitter, Input, NgZone, Renderer, Optional, Output } from '@angular/core'; +import { Directive, ElementRef, EventEmitter, Input, NgZone, Optional, Output, Renderer } from '@angular/core'; import { Content } from '../content/content'; import { DomController } from '../../platform/dom-controller'; import { isTrueProperty, reorderArray } from '../../util/util'; -import { ItemReorderGestureDelegate, ItemReorderGesture } from './item-reorder-gesture'; +import { ItemReorderGesture, ItemReorderGestureDelegate } from './item-reorder-gesture'; import { Platform } from '../../platform/platform'; @@ -278,7 +278,7 @@ export class ItemReorder implements ItemReorderGestureDelegate { /********* DOM WRITE ********* */ let transform = this._plt.Css.transform; if (toIndex >= lastToIndex) { - for (var i = lastToIndex; i <= toIndex; i++) { + for (let i = lastToIndex; i <= toIndex; i++) { if (i !== fromIndex) { (children[i]).style[transform] = (i > fromIndex) ? `translateY(${-itemHeight}px)` : ''; @@ -287,7 +287,7 @@ export class ItemReorder implements ItemReorderGestureDelegate { } if (toIndex <= lastToIndex) { - for (var i = toIndex; i <= lastToIndex; i++) { + for (let i = toIndex; i <= lastToIndex; i++) { if (i !== fromIndex) { (children[i]).style[transform] = (i < fromIndex) ? `translateY(${itemHeight}px)` : ''; diff --git a/src/components/item/item-sliding-gesture.ts b/src/components/item/item-sliding-gesture.ts index 7fdd420556..afe423ba2f 100644 --- a/src/components/item/item-sliding-gesture.ts +++ b/src/components/item/item-sliding-gesture.ts @@ -1,7 +1,7 @@ import { ItemSliding } from './item-sliding'; import { List } from '../list/list'; import { DomController } from '../../platform/dom-controller'; -import { GestureController, GESTURE_PRIORITY_SLIDING_ITEM, GESTURE_ITEM_SWIPE } from '../../gestures/gesture-controller'; +import { GESTURE_ITEM_SWIPE, GESTURE_PRIORITY_SLIDING_ITEM, GestureController } from '../../gestures/gesture-controller'; import { PanGesture } from '../../gestures/pan-gesture'; import { Platform } from '../../platform/platform'; import { pointerCoord } from '../../util/dom'; diff --git a/src/components/item/item-sliding.ts b/src/components/item/item-sliding.ts index 986966052b..65b4e12602 100644 --- a/src/components/item/item-sliding.ts +++ b/src/components/item/item-sliding.ts @@ -1,6 +1,19 @@ -import { ChangeDetectionStrategy, Component, ContentChildren, ContentChild, ElementRef, EventEmitter, forwardRef, Optional, Output, QueryList, Renderer, ViewEncapsulation, NgZone } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + ContentChild, + ContentChildren, + ElementRef, + EventEmitter, + NgZone, + Optional, + Output, + QueryList, + Renderer, + ViewEncapsulation, + forwardRef } from '@angular/core'; -import { swipeShouldReset, assert } from '../../util/util'; +import { assert, swipeShouldReset } from '../../util/util'; import { Item } from './item'; import { List } from '../list/list'; import { Platform } from '../../platform/platform'; @@ -266,11 +279,11 @@ export class ItemSliding { } if (openAmount > this._optsWidthRightSide) { - var optsWidth = this._optsWidthRightSide; + const optsWidth = this._optsWidthRightSide; openAmount = optsWidth + (openAmount - optsWidth) * ELASTIC_FACTOR; } else if (openAmount < -this._optsWidthLeftSide) { - var optsWidth = -this._optsWidthLeftSide; + const optsWidth = -this._optsWidthLeftSide; openAmount = optsWidth + (openAmount - optsWidth) * ELASTIC_FACTOR; } @@ -354,7 +367,7 @@ export class ItemSliding { this._setState(state); } else if (openAmount < 0) { - var state = (openAmount <= (-this._optsWidthLeftSide - SWIPE_MARGIN)) + const state = (openAmount <= (-this._optsWidthLeftSide - SWIPE_MARGIN)) ? SlidingState.Left | SlidingState.SwipeLeft : SlidingState.Left; diff --git a/src/components/item/item.ts b/src/components/item/item.ts index 87152f022e..87088fba56 100644 --- a/src/components/item/item.ts +++ b/src/components/item/item.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, ContentChild, ContentChildren, ElementRef, QueryList, Renderer, Optional, ViewChild, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ContentChild, ContentChildren, ElementRef, Optional, QueryList, Renderer, ViewChild, ViewEncapsulation } from '@angular/core'; import { Button } from '../button/button'; import { Config } from '../../config/config'; diff --git a/src/components/item/test/groups/pages/session-list/session-list.ts b/src/components/item/test/groups/pages/session-list/session-list.ts index 6bce8bc1a8..a8922f28c5 100644 --- a/src/components/item/test/groups/pages/session-list/session-list.ts +++ b/src/components/item/test/groups/pages/session-list/session-list.ts @@ -22,7 +22,7 @@ export class SessionList { window.location.reload(); } -}; +} const data = [ diff --git a/src/components/item/test/sliding/pages/root-page/root-page.ts b/src/components/item/test/sliding/pages/root-page/root-page.ts index 7a5602999c..1168561429 100644 --- a/src/components/item/test/sliding/pages/root-page/root-page.ts +++ b/src/components/item/test/sliding/pages/root-page/root-page.ts @@ -1,5 +1,5 @@ import { Component, ViewChild } from '@angular/core'; -import { AlertController, List, ItemSliding, ToastController } from '../../../../../../'; +import { AlertController, ItemSliding, List, ToastController } from '../../../../../../'; @Component({ templateUrl: 'root-page.html' @@ -52,7 +52,7 @@ export class RootPage { console.log('UNREAD', item); } - didClick(item: ItemSliding) { + didClick(_: ItemSliding) { console.log('Clicked, ion-item'); let alert = this.alertCtrl.create({ diff --git a/src/components/label/label.ts b/src/components/label/label.ts index 78d9ba9d6b..14fff2576a 100644 --- a/src/components/label/label.ts +++ b/src/components/label/label.ts @@ -1,4 +1,4 @@ -import { Attribute, Directive, ElementRef, Renderer, Input } from '@angular/core'; +import { Attribute, Directive, ElementRef, Input, Renderer } from '@angular/core'; import { Config } from '../../config/config'; import { Ion } from '../ion'; diff --git a/src/components/loading/loading-component.ts b/src/components/loading/loading-component.ts index 04551e6b18..f50d857eb5 100644 --- a/src/components/loading/loading-component.ts +++ b/src/components/loading/loading-component.ts @@ -1,12 +1,11 @@ import { Component, ElementRef, HostListener, Renderer, ViewEncapsulation } from '@angular/core'; import { Config } from '../../config/config'; -import { GestureController, BlockerDelegate, BLOCK_ALL } from '../../gestures/gesture-controller'; -import { isDefined, isUndefined, assert } from '../../util/util'; +import { BLOCK_ALL, BlockerDelegate, GestureController } from '../../gestures/gesture-controller'; +import { assert, isDefined, isUndefined } from '../../util/util'; import { KEY_ESCAPE } from '../../platform/key'; import { LoadingOptions } from './loading-options'; import { NavParams } from '../../navigation/nav-params'; -import { Platform } from '../../platform/platform'; import { ViewController } from '../../navigation/view-controller'; /** @@ -37,8 +36,7 @@ export class LoadingCmp { constructor( private _viewCtrl: ViewController, private _config: Config, - private _plt: Platform, - private _elementRef: ElementRef, + _elementRef: ElementRef, gestureCtrl: GestureController, params: NavParams, renderer: Renderer diff --git a/src/components/loading/loading.ts b/src/components/loading/loading.ts index c3c6118808..548cfe5967 100644 --- a/src/components/loading/loading.ts +++ b/src/components/loading/loading.ts @@ -4,7 +4,7 @@ import { isPresent } from '../../util/util'; import { PORTAL_LOADING } from '../app/app-constants'; import { LoadingCmp } from './loading-component'; import { LoadingOptions } from './loading-options'; -import { LoadingPopIn, LoadingPopOut, LoadingMdPopIn, LoadingMdPopOut, LoadingWpPopIn, LoadingWpPopOut } from './loading-transitions'; +import { LoadingMdPopIn, LoadingMdPopOut, LoadingPopIn, LoadingPopOut, LoadingWpPopIn, LoadingWpPopOut } from './loading-transitions'; import { NavOptions } from '../../navigation/nav-util'; import { ViewController } from '../../navigation/view-controller'; diff --git a/src/components/loading/test/basic/app/app.component.ts b/src/components/loading/test/basic/app/app.component.ts index 24bc0495b2..a93c05162e 100644 --- a/src/components/loading/test/basic/app/app.component.ts +++ b/src/components/loading/test/basic/app/app.component.ts @@ -12,11 +12,11 @@ export class AppComponent { root = PageOne; constructor(app: App) { - app.viewDidLeave.subscribe((ev: any) => { + app.viewDidLeave.subscribe((_: any) => { console.log('App didLeave'); }); - app.viewWillLeave.subscribe((ev: any) => { + app.viewWillLeave.subscribe((_: any) => { console.log('App willLeave'); }); } diff --git a/src/components/menu/menu-gestures.ts b/src/components/menu/menu-gestures.ts index 72be2da681..2f0916a3f9 100644 --- a/src/components/menu/menu-gestures.ts +++ b/src/components/menu/menu-gestures.ts @@ -1,6 +1,6 @@ import { Menu } from './menu'; import { DomController } from '../../platform/dom-controller'; -import { GestureController, GESTURE_PRIORITY_MENU_SWIPE, GESTURE_MENU_SWIPE } from '../../gestures/gesture-controller'; +import { GESTURE_MENU_SWIPE, GESTURE_PRIORITY_MENU_SWIPE, GestureController } from '../../gestures/gesture-controller'; import { Platform } from '../../platform/platform'; import { SlideEdgeGesture } from '../../gestures/slide-edge-gesture'; import { SlideData } from '../../gestures/slide-gesture'; @@ -46,7 +46,7 @@ export class MenuContentGesture extends SlideEdgeGesture { } // Set CSS, then wait one frame for it to apply before sliding starts - onSlideBeforeStart(ev: any) { + onSlideBeforeStart() { console.debug('menu gesture, onSlideBeforeStart', this.menu.side); this.menu._swipeBeforeStart(); } @@ -56,14 +56,14 @@ export class MenuContentGesture extends SlideEdgeGesture { this.menu._swipeStart(); } - onSlide(slide: SlideData, ev: any) { + onSlide(slide: SlideData) { const z = (this.menu.isRightSide !== this.plt.isRTL ? slide.min : slide.max); const stepValue = (slide.distance / z); this.menu._swipeProgress(stepValue); } - onSlideEnd(slide: SlideData, ev: any) { + onSlideEnd(slide: SlideData) { let z = (this.menu.isRightSide !== this.plt.isRTL ? slide.min : slide.max); const currentStepValue = (slide.distance / z); const velocity = slide.velocity; @@ -87,7 +87,7 @@ export class MenuContentGesture extends SlideEdgeGesture { this.menu._swipeEnd(shouldCompleteLeft, shouldCompleteRight, currentStepValue, velocity); } - getElementStartPos(slide: SlideData, ev: any) { + getElementStartPos(slide: SlideData) { const menu = this.menu; if (menu.isRightSide !== this.plt.isRTL) { return menu.isOpen ? slide.min : slide.max; diff --git a/src/components/menu/menu-toggle.ts b/src/components/menu/menu-toggle.ts index 166195b499..b346beb134 100644 --- a/src/components/menu/menu-toggle.ts +++ b/src/components/menu/menu-toggle.ts @@ -1,4 +1,4 @@ -import { Directive, Input, HostListener, Optional } from '@angular/core'; +import { Directive, HostListener, Input, Optional } from '@angular/core'; import { Button } from '../button/button'; import { MenuController } from '../app/menu-controller'; @@ -111,7 +111,7 @@ export class MenuToggle { private _menu: MenuController, @Optional() private _viewCtrl: ViewController, @Optional() private _button: Button, - @Optional() private _navbar: Navbar + @Optional() _navbar: Navbar ) { this._isButton = !!_button; this._inNavbar = !!_navbar; diff --git a/src/components/menu/menu.ts b/src/components/menu/menu.ts index fa696fa8ef..4fd8c995e3 100644 --- a/src/components/menu/menu.ts +++ b/src/components/menu/menu.ts @@ -1,12 +1,12 @@ -import { OnInit, OnDestroy, ChangeDetectionStrategy, Component, ContentChild, ElementRef, EventEmitter, forwardRef, Input, Output, Renderer, ViewChild, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ContentChild, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, Renderer, ViewChild, ViewEncapsulation, forwardRef } from '@angular/core'; import { App } from '../app/app'; import { Backdrop } from '../backdrop/backdrop'; import { Config } from '../../config/config'; import { Content } from '../content/content'; import { DomController } from '../../platform/dom-controller'; -import { GestureController, GESTURE_GO_BACK_SWIPE, BlockerDelegate } from '../../gestures/gesture-controller'; -import { isTrueProperty, Side, isRightSide, assert } from '../../util/util'; +import { BlockerDelegate, GESTURE_GO_BACK_SWIPE, GestureController, } from '../../gestures/gesture-controller'; +import { Side, assert, isRightSide, isTrueProperty } from '../../util/util'; import { Keyboard } from '../../platform/keyboard'; import { MenuContentGesture } from './menu-gestures'; import { Menu as MenuInterface } from '../app/menu-interface'; diff --git a/src/components/menu/test/enable-disable/app.module.ts b/src/components/menu/test/enable-disable/app.module.ts index b1e6304360..db74a3d49a 100644 --- a/src/components/menu/test/enable-disable/app.module.ts +++ b/src/components/menu/test/enable-disable/app.module.ts @@ -1,6 +1,6 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; +import { Component, NgModule, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { IonicApp, IonicModule, App, MenuController, Nav } from '../../../..'; +import { App, IonicApp, IonicModule, MenuController, Nav } from '../../../..'; @Component({ diff --git a/src/components/menu/test/overlay/app.module.ts b/src/components/menu/test/overlay/app.module.ts index e49268830d..b87e64e757 100644 --- a/src/components/menu/test/overlay/app.module.ts +++ b/src/components/menu/test/overlay/app.module.ts @@ -1,6 +1,6 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; +import { Component, NgModule, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { IonicApp, IonicModule, Nav, AlertController } from '../../../..'; +import { AlertController, IonicApp, IonicModule, Nav } from '../../../..'; @Component({templateUrl: 'page1.html'}) diff --git a/src/components/menu/test/push/app.module.ts b/src/components/menu/test/push/app.module.ts index e49268830d..b87e64e757 100644 --- a/src/components/menu/test/push/app.module.ts +++ b/src/components/menu/test/push/app.module.ts @@ -1,6 +1,6 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; +import { Component, NgModule, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { IonicApp, IonicModule, Nav, AlertController } from '../../../..'; +import { AlertController, IonicApp, IonicModule, Nav } from '../../../..'; @Component({templateUrl: 'page1.html'}) diff --git a/src/components/menu/test/reveal/app.module.ts b/src/components/menu/test/reveal/app.module.ts index 9c6a4dab45..3acf38e37c 100644 --- a/src/components/menu/test/reveal/app.module.ts +++ b/src/components/menu/test/reveal/app.module.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; +import { Component, NgModule, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { IonicApp, IonicModule, Nav } from '../../../..'; diff --git a/src/components/modal/modal-component.ts b/src/components/modal/modal-component.ts index f87b158f5c..50955a736b 100644 --- a/src/components/modal/modal-component.ts +++ b/src/components/modal/modal-component.ts @@ -4,7 +4,7 @@ import { KEY_ESCAPE } from '../../platform/key'; import { NavParams } from '../../navigation/nav-params'; import { NavOptions } from '../../navigation/nav-util'; import { ViewController } from '../../navigation/view-controller'; -import { GestureController, BlockerDelegate, GESTURE_MENU_SWIPE, GESTURE_GO_BACK_SWIPE } from '../../gestures/gesture-controller'; +import { BlockerDelegate, GESTURE_GO_BACK_SWIPE, GESTURE_MENU_SWIPE, GestureController } from '../../gestures/gesture-controller'; import { ModuleLoader } from '../../util/module-loader'; import { assert } from '../../util/util'; diff --git a/src/components/modal/modal-impl.ts b/src/components/modal/modal-impl.ts index ec40e15156..58502b9123 100644 --- a/src/components/modal/modal-impl.ts +++ b/src/components/modal/modal-impl.ts @@ -4,7 +4,7 @@ import { isPresent } from '../../util/util'; import { PORTAL_MODAL } from '../app/app-constants'; import { ModalCmp } from './modal-component'; import { ModalOptions } from './modal-options'; -import { ModalSlideIn, ModalSlideOut, ModalMDSlideIn, ModalMDSlideOut } from './modal-transitions'; +import { ModalMDSlideIn, ModalMDSlideOut, ModalSlideIn, ModalSlideOut } from './modal-transitions'; import { NavOptions } from '../../navigation/nav-util'; import { ViewController } from '../../navigation/view-controller'; diff --git a/src/components/modal/test/basic/app/app.module.ts b/src/components/modal/test/basic/app/app.module.ts index ec89d90fe7..92c32cc5d3 100644 --- a/src/components/modal/test/basic/app/app.module.ts +++ b/src/components/modal/test/basic/app/app.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { IonicModule, IonicApp } from '../../../../..'; +import { IonicApp, IonicModule } from '../../../../..'; import { AppComponent } from './app.component'; import { PageOneModule } from '../pages/page-one/page-one.module'; diff --git a/src/components/modal/test/basic/pages/page-one/page-one.ts b/src/components/modal/test/basic/pages/page-one/page-one.ts index 545c68ca9a..146de97a57 100644 --- a/src/components/modal/test/basic/pages/page-one/page-one.ts +++ b/src/components/modal/test/basic/pages/page-one/page-one.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { Config, IonicPage, NavController, ModalController, ToastController, Platform } from '../../../../../..'; +import { Config, IonicPage, ModalController, NavController, Platform, ToastController } from '../../../../../..'; @IonicPage() @Component({ diff --git a/src/components/modal/test/basic/pages/page-two/page-two.ts b/src/components/modal/test/basic/pages/page-two/page-two.ts index 64e111fb32..8fdb41fd8d 100644 --- a/src/components/modal/test/basic/pages/page-two/page-two.ts +++ b/src/components/modal/test/basic/pages/page-two/page-two.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { App, ActionSheetController, AlertController, IonicPage, ModalController, NavController, ToastController } from '../../../../../..'; +import { ActionSheetController, AlertController, App, IonicPage, ModalController, NavController, ToastController } from '../../../../../..'; @IonicPage() @Component({ diff --git a/src/components/nav/nav.ts b/src/components/nav/nav.ts index afc4bcfad2..e1568b755f 100644 --- a/src/components/nav/nav.ts +++ b/src/components/nav/nav.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, ComponentFactoryResolver, ElementRef, ErrorHandler, forwardRef, Input, Optional, NgZone, Renderer, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core'; +import { AfterViewInit, Component, ComponentFactoryResolver, ElementRef, ErrorHandler, Input, NgZone, Optional, Renderer, ViewChild, ViewContainerRef, ViewEncapsulation, forwardRef } from '@angular/core'; import { App } from '../app/app'; import { Config } from '../../config/config'; diff --git a/src/components/nav/test/basic/pages/first-page/first-page.ts b/src/components/nav/test/basic/pages/first-page/first-page.ts index f2df09ae66..0c42ced72b 100644 --- a/src/components/nav/test/basic/pages/first-page/first-page.ts +++ b/src/components/nav/test/basic/pages/first-page/first-page.ts @@ -118,11 +118,11 @@ export class FirstPage { this.navCtrl.push('primary-header-page', null, { animate: true, animation: 'ios-transition' - }).then(() => { }, (rejectReason: string) => { }); + }).then(() => { }, () => { }); } pushRedirect() { - this.navCtrl.push('redirect-page').then(() => { }, (rejectReason: string) => { }); + this.navCtrl.push('redirect-page').then(() => { }, () => { }); } pushFullPage() { diff --git a/src/components/nav/test/basic/pages/full-page/full-page.ts b/src/components/nav/test/basic/pages/full-page/full-page.ts index 18c5cd15e6..6cbe341796 100644 --- a/src/components/nav/test/basic/pages/full-page/full-page.ts +++ b/src/components/nav/test/basic/pages/full-page/full-page.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { App, AlertController, IonicPage, NavController, NavParams, ViewController } from '../../../../../..'; +import { AlertController, App, IonicPage, NavController, NavParams, ViewController } from '../../../../../..'; @IonicPage({ name: 'full-page' diff --git a/src/components/nav/test/worst-case/app.module.ts b/src/components/nav/test/worst-case/app.module.ts index 0f8626ccff..23d44dc10d 100644 --- a/src/components/nav/test/worst-case/app.module.ts +++ b/src/components/nav/test/worst-case/app.module.ts @@ -125,7 +125,7 @@ export class Page4 extends Base { } doSomethingSync() { - // this is a long running synchronous task + // this is a long running synchronous task // (imagine that a huge data must be transformed here recuresively or something similar) console.log('START DOING SOMETHING'); console.time('DO SOMETHING EXPENSIVE SYNCHRONOUSLY'); diff --git a/src/components/picker/picker-column.ts b/src/components/picker/picker-column.ts index 940abdd314..5490bf638c 100644 --- a/src/components/picker/picker-column.ts +++ b/src/components/picker/picker-column.ts @@ -4,7 +4,7 @@ import { clamp } from '../../util/util'; import { Config } from '../../config/config'; import { DomController, DomDebouncer } from '../../platform/dom-controller'; import { Haptic } from '../../tap-click/haptic'; -import { PickerColumn, DECELERATION_FRICTION, FRAME_MS, MAX_PICKER_SPEED, PICKER_OPT_SELECTED } from './picker-options'; +import { DECELERATION_FRICTION, FRAME_MS, MAX_PICKER_SPEED, PICKER_OPT_SELECTED, PickerColumn } from './picker-options'; import { Platform } from '../../platform/platform'; import { pointerCoord } from '../../util/dom'; import { UIEventManager } from '../../gestures/ui-event-manager'; diff --git a/src/components/picker/picker-component.ts b/src/components/picker/picker-component.ts index 2a745a0917..4492421c18 100644 --- a/src/components/picker/picker-component.ts +++ b/src/components/picker/picker-component.ts @@ -1,13 +1,12 @@ import { Component, ElementRef, HostListener, QueryList, Renderer, ViewChildren, ViewEncapsulation } from '@angular/core'; -import { isNumber, isPresent, isString, assert } from '../../util/util'; +import { assert, isNumber, isPresent, isString } from '../../util/util'; import { Config } from '../../config/config'; -import { GestureController, BlockerDelegate, BLOCK_ALL } from '../../gestures/gesture-controller'; +import { BLOCK_ALL, BlockerDelegate, GestureController, } from '../../gestures/gesture-controller'; import { KEY_ENTER, KEY_ESCAPE } from '../../platform/key'; import { NavParams } from '../../navigation/nav-params'; import { Picker } from './picker'; -import { PickerOptions, PickerColumnOption } from './picker-options'; -import { Platform } from '../../platform/platform'; +import { PickerColumnOption, PickerOptions } from './picker-options'; import { ViewController } from '../../navigation/view-controller'; import { PickerColumnCmp } from './picker-column'; @@ -53,7 +52,6 @@ export class PickerCmp { private _viewCtrl: ViewController, private _elementRef: ElementRef, config: Config, - private _plt: Platform, gestureCtrl: GestureController, params: NavParams, renderer: Renderer @@ -133,7 +131,7 @@ export class PickerCmp { this._cols.forEach(column => column.refresh()); } - _colChange(selectedOption: PickerColumnOption) { + _colChange() { // one of the columns has changed its selected index var picker = this._viewCtrl; picker.ionChange.emit(this.getSelected()); diff --git a/src/components/picker/picker.ts b/src/components/picker/picker.ts index c132439fb3..341d78413f 100644 --- a/src/components/picker/picker.ts +++ b/src/components/picker/picker.ts @@ -2,10 +2,10 @@ import { EventEmitter, Output } from '@angular/core'; import { App } from '../app/app'; import { Config } from '../../config/config'; -import { isPresent, assert } from '../../util/util'; +import { assert, isPresent } from '../../util/util'; import { NavOptions } from '../../navigation/nav-util'; import { PickerCmp } from './picker-component'; -import { PickerOptions, PickerColumn } from './picker-options'; +import { PickerColumn, PickerOptions } from './picker-options'; import { PickerSlideIn, PickerSlideOut } from './picker-transitions'; import { ViewController } from '../../navigation/view-controller'; diff --git a/src/components/popover/popover-component.ts b/src/components/popover/popover-component.ts index f03a0b3db0..1d3525c06c 100644 --- a/src/components/popover/popover-component.ts +++ b/src/components/popover/popover-component.ts @@ -3,9 +3,8 @@ import { Component, ComponentFactoryResolver, ElementRef, HostListener, Renderer import { Config } from '../../config/config'; import { KEY_ESCAPE } from '../../platform/key'; import { NavParams } from '../../navigation/nav-params'; -import { Platform } from '../../platform/platform'; import { ViewController } from '../../navigation/view-controller'; -import { GestureController, BlockerDelegate, BLOCK_ALL } from '../../gestures/gesture-controller'; +import { BLOCK_ALL, BlockerDelegate, GestureController } from '../../gestures/gesture-controller'; import { ModuleLoader } from '../../util/module-loader'; import { assert } from '../../util/util'; @@ -45,7 +44,6 @@ export class PopoverCmp { public _elementRef: ElementRef, public _renderer: Renderer, public _config: Config, - private _plt: Platform, public _navParams: NavParams, public _viewCtrl: ViewController, gestureCtrl: GestureController, diff --git a/src/components/popover/popover-impl.ts b/src/components/popover/popover-impl.ts index 752dd2dec1..8065bd2aff 100644 --- a/src/components/popover/popover-impl.ts +++ b/src/components/popover/popover-impl.ts @@ -4,7 +4,7 @@ import { isPresent } from '../../util/util'; import { NavOptions } from '../../navigation/nav-util'; import { PopoverCmp } from './popover-component'; import { PopoverOptions } from './popover-options'; -import { PopoverPopIn, PopoverPopOut, PopoverMdPopIn, PopoverMdPopOut } from './popover-transitions'; +import { PopoverMdPopIn, PopoverMdPopOut, PopoverPopIn, PopoverPopOut } from './popover-transitions'; import { ViewController } from '../../navigation/view-controller'; diff --git a/src/components/popover/test/basic/pages/page-one/page-one.ts b/src/components/popover/test/basic/pages/page-one/page-one.ts index e1355283fc..22997f2ede 100644 --- a/src/components/popover/test/basic/pages/page-one/page-one.ts +++ b/src/components/popover/test/basic/pages/page-one/page-one.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, ElementRef } from '@angular/core'; +import { Component, ElementRef, ViewChild } from '@angular/core'; import { IonicPage, PopoverController } from '../../../../../..'; diff --git a/src/components/radio/radio-button.ts b/src/components/radio/radio-button.ts index a4cb35e370..e030d71d2a 100644 --- a/src/components/radio/radio-button.ts +++ b/src/components/radio/radio-button.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, EventEmitter, HostListener, Input, OnInit, OnDestroy, Optional, Output, Renderer, ViewEncapsulation } from '@angular/core'; +import { Component, ElementRef, EventEmitter, HostListener, Input, OnDestroy, OnInit, Optional, Output, Renderer, ViewEncapsulation } from '@angular/core'; import { Config } from '../../config/config'; import { Form, IonicTapInput } from '../../util/form'; diff --git a/src/components/radio/test/radio.spec.ts b/src/components/radio/test/radio.spec.ts index c3fbcac954..d0a3595f55 100644 --- a/src/components/radio/test/radio.spec.ts +++ b/src/components/radio/test/radio.spec.ts @@ -1,7 +1,7 @@ import { RadioGroup } from '../radio-group'; import { RadioButton } from '../radio-button'; import { Form } from '../../../util/form'; -import { mockChangeDetectorRef, mockConfig, mockRenderer, mockElementRef } from '../../../util/mock-providers'; +import { mockChangeDetectorRef, mockConfig, mockElementRef, mockRenderer } from '../../../util/mock-providers'; describe('RadioGroup', () => { diff --git a/src/components/range/range-knob.ts b/src/components/range/range-knob.ts index 4ed49d12b8..54aa3c9a5a 100644 --- a/src/components/range/range-knob.ts +++ b/src/components/range/range-knob.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, HostListener, Input, Output } from '@angular/core'; -import { KEY_LEFT, KEY_RIGHT, KEY_UP, KEY_DOWN } from '../../platform/key'; +import { KEY_DOWN, KEY_LEFT, KEY_RIGHT, KEY_UP } from '../../platform/key'; /** * @hidden diff --git a/src/components/range/test/range.spec.ts b/src/components/range/test/range.spec.ts index 4e1855e6fa..7b94afd69e 100644 --- a/src/components/range/test/range.spec.ts +++ b/src/components/range/test/range.spec.ts @@ -1,7 +1,7 @@ import { Range } from '../range'; -import { mockChangeDetectorRef, mockConfig, mockDomController, mockItem, mockElementRef, mockHaptic, mockPlatform, mockRenderer } from '../../../util/mock-providers'; +import { mockChangeDetectorRef, mockConfig, mockDomController, mockElementRef, mockHaptic, mockItem, mockPlatform, mockRenderer } from '../../../util/mock-providers'; import { Form } from '../../../util/form'; -import { commonInputTest, NUMBER_CORPUS } from '../../../util/input-tester'; +import { NUMBER_CORPUS, commonInputTest } from '../../../util/input-tester'; describe('Range', () => { diff --git a/src/components/refresher/refresher.ts b/src/components/refresher/refresher.ts index 04580f3fd3..cfa897a7ca 100644 --- a/src/components/refresher/refresher.ts +++ b/src/components/refresher/refresher.ts @@ -1,7 +1,7 @@ import { Directive, EventEmitter, Host, Input, NgZone, Output } from '@angular/core'; import { Content } from '../content/content'; -import { GestureController, GestureDelegate, GESTURE_PRIORITY_REFRESHER, GESTURE_REFRESHER } from '../../gestures/gesture-controller'; +import { GESTURE_PRIORITY_REFRESHER, GESTURE_REFRESHER, GestureController, GestureDelegate } from '../../gestures/gesture-controller'; import { isTrueProperty } from '../../util/util'; import { Platform } from '../../platform/platform'; import { pointerCoord } from '../../util/dom'; diff --git a/src/components/refresher/test/basic/app.module.ts b/src/components/refresher/test/basic/app.module.ts index caa5d0189f..55c456e9c7 100644 --- a/src/components/refresher/test/basic/app.module.ts +++ b/src/components/refresher/test/basic/app.module.ts @@ -28,7 +28,7 @@ export class Page1 { }); } - doStart(refresher: Refresher) { + doStart() { console.info('Refresher, start'); } diff --git a/src/components/refresher/test/navigation/app.module.ts b/src/components/refresher/test/navigation/app.module.ts index bde5f1c19c..84d7063bda 100644 --- a/src/components/refresher/test/navigation/app.module.ts +++ b/src/components/refresher/test/navigation/app.module.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Refresher, NavController } from '../../../..'; +import { IonicApp, IonicModule, NavController, Refresher } from '../../../..'; @Component({ @@ -27,7 +27,7 @@ export class Page1 { }); } - doStart(refresher: Refresher) { + doStart() { console.info('Refresher, start'); } diff --git a/src/components/scroll/scroll.ts b/src/components/scroll/scroll.ts index 8dda0faef3..fae752bc3b 100644 --- a/src/components/scroll/scroll.ts +++ b/src/components/scroll/scroll.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, ElementRef, Input, ViewChild, ViewEncapsulation } from '@angular/core'; -import { isTrueProperty, assert } from '../../util/util'; +import { assert, isTrueProperty } from '../../util/util'; /** * @name Scroll diff --git a/src/components/searchbar/test/basic/pages/root-page/root-page.ts b/src/components/searchbar/test/basic/pages/root-page/root-page.ts index 093582aa0b..92f50f12e9 100644 --- a/src/components/searchbar/test/basic/pages/root-page/root-page.ts +++ b/src/components/searchbar/test/basic/pages/root-page/root-page.ts @@ -1,4 +1,4 @@ -import { Component, ChangeDetectorRef } from '@angular/core'; +import { ChangeDetectorRef, Component } from '@angular/core'; import { IonicPage } from '../../../../../..'; @IonicPage() diff --git a/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts b/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts index dace0d2c72..d51a576940 100644 --- a/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts +++ b/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts @@ -8,7 +8,7 @@ import { IonicPage, NavParams } from '../../../../../..'; export class DetailPage { city: string; - constructor(private _navParams: NavParams) { + constructor(_navParams: NavParams) { this.city = _navParams.get('city'); } } diff --git a/src/components/searchbar/test/nav/pages/search-page/search-page.ts b/src/components/searchbar/test/nav/pages/search-page/search-page.ts index 54049475ea..7d598e5efa 100644 --- a/src/components/searchbar/test/nav/pages/search-page/search-page.ts +++ b/src/components/searchbar/test/nav/pages/search-page/search-page.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { IonicPage, NavController, ModalController } from '../../../../../..'; +import { IonicPage, ModalController, NavController } from '../../../../../..'; @IonicPage() @Component({ diff --git a/src/components/segment/test/swipe/pages/e2e-page/e2e-page.ts b/src/components/segment/test/swipe/pages/e2e-page/e2e-page.ts index c7ad32d6e3..0748906666 100644 --- a/src/components/segment/test/swipe/pages/e2e-page/e2e-page.ts +++ b/src/components/segment/test/swipe/pages/e2e-page/e2e-page.ts @@ -1,5 +1,5 @@ import { Component, ViewChild } from '@angular/core'; -import { Slides, SegmentButton } from '../../../../../..'; +import { SegmentButton, Slides } from '../../../../../..'; @Component({ diff --git a/src/components/select/select.ts b/src/components/select/select.ts index 1d495cb3e0..d218bacf1f 100644 --- a/src/components/select/select.ts +++ b/src/components/select/select.ts @@ -1,4 +1,4 @@ -import { Component, ContentChildren, ElementRef, EventEmitter, Input, HostListener, OnDestroy, Optional, Output, Renderer, QueryList, ViewEncapsulation } from '@angular/core'; +import { Component, ContentChildren, ElementRef, EventEmitter, HostListener, Input, OnDestroy, Optional, Output, QueryList, Renderer, ViewEncapsulation } from '@angular/core'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { ActionSheet } from '../action-sheet/action-sheet'; @@ -9,7 +9,7 @@ import { Config } from '../../config/config'; import { DeepLinker } from '../../navigation/deep-linker'; import { Form } from '../../util/form'; import { BaseInput } from '../../util/base-input'; -import { isCheckedProperty, isTrueProperty, deepCopy, deepEqual, assert } from '../../util/util'; +import { assert, deepCopy, deepEqual, isCheckedProperty, isTrueProperty } from '../../util/util'; import { Item } from '../item/item'; import { Option } from '../option/option'; import { SelectPopover, SelectPopoverOption } from './select-popover-component'; @@ -379,7 +379,7 @@ export class Select extends BaseInput implements OnDestroy { }; }); - var selectCssClass = 'select-alert'; + let selectCssClass = 'select-alert'; // create the alert instance from our built up selectOptions overlay = new Alert(this._app, selectOptions, this.config); diff --git a/src/components/slides/slides.ts b/src/components/slides/slides.ts index 5b8f35de51..172f2ea68e 100644 --- a/src/components/slides/slides.ts +++ b/src/components/slides/slides.ts @@ -8,7 +8,16 @@ import { initEvents } from './swiper/swiper-events'; import { initZoom } from './swiper/swiper-zoom'; import { Platform } from '../../platform/platform'; import { SlideContainer, SlideElement, SlideTouchEvents, SlideTouches, SlideZoom } from './swiper/swiper-interfaces'; -import { slideTo, slideNext, slidePrev, update, initSwiper, destroySwiper, startAutoplay, stopAutoplay } from './swiper/swiper'; +import { + destroySwiper, + initSwiper, + slideNext, + slidePrev, + slideTo, + startAutoplay, + stopAutoplay, + update, +} from './swiper/swiper'; import { SWIPER_EFFECTS } from './swiper/swiper-effects'; import { ViewController } from '../../navigation/view-controller'; @@ -369,7 +378,7 @@ export class Slides extends Ion { } private _slidesPerView: number|string = 1; - /** + /** * @input {boolean} Center a slide in the middle of the screen. */ @Input() diff --git a/src/components/slides/swiper/swiper-a11y.ts b/src/components/slides/swiper/swiper-a11y.ts index f037e3bc20..d892b099af 100755 --- a/src/components/slides/swiper/swiper-a11y.ts +++ b/src/components/slides/swiper/swiper-a11y.ts @@ -73,7 +73,7 @@ export function ariaHidden(ele: HTMLElement, isHidden: boolean) { } } -function onEnterKey(s: Slides, event: KeyboardEvent) { +function onEnterKey(_: Slides, __: KeyboardEvent) { // if (event.keyCode !== 13) return; // const target: HTMLElement = event.target; diff --git a/src/components/slides/swiper/swiper-classes.ts b/src/components/slides/swiper/swiper-classes.ts index 21cbe3b8ca..130c01933f 100644 --- a/src/components/slides/swiper/swiper-classes.ts +++ b/src/components/slides/swiper/swiper-classes.ts @@ -1,5 +1,5 @@ import { ariaDisable, ariaHidden } from './swiper-a11y'; -import { addClass, removeClass, queryChildren, CLS } from './swiper-utils'; +import { CLS, addClass, queryChildren, removeClass } from './swiper-utils'; import { Slides } from '../slides'; import { updatePaginationClasses } from './swiper-pagination'; diff --git a/src/components/slides/swiper/swiper-controller.ts b/src/components/slides/swiper/swiper-controller.ts index 515e31d549..d833dde1b4 100644 --- a/src/components/slides/swiper/swiper-controller.ts +++ b/src/components/slides/swiper/swiper-controller.ts @@ -10,7 +10,7 @@ import { updateProgress } from './swiper-progress'; Controller ===========================*/ export const SWIPER_CONTROLLER = { - LinearSpline: function (s: Slides, plt: Platform, x: any, y: any) { + LinearSpline: function (_s: Slides, _platform: Platform, x: any, y: any) { this.x = x; this.y = y; this.lastIndex = x.length - 1; diff --git a/src/components/slides/swiper/swiper-effects.ts b/src/components/slides/swiper/swiper-effects.ts index daa5360073..31375cc0d4 100755 --- a/src/components/slides/swiper/swiper-effects.ts +++ b/src/components/slides/swiper/swiper-effects.ts @@ -1,6 +1,6 @@ import { SlideEffects } from './swiper-interfaces'; -import { isHorizontal, transform, transition, eachChild, triggerTransitionEnd, CLS } from './swiper-utils'; -import { isSafari, isIosUIWebView } from '../../../platform/platform-utils'; +import { CLS, eachChild, isHorizontal, transform, transition, triggerTransitionEnd } from './swiper-utils'; +import { isIosUIWebView, isSafari } from '../../../platform/platform-utils'; /*========================= @@ -37,7 +37,7 @@ export const SWIPER_EFFECTS: SlideEffects = { if (s.virtualTranslate && duration !== 0) { var eventTriggered = false; - for (var i = 0; i < slides.length; i++) { + for (let i = 0; i < slides.length; i++) { plt.transitionEnd(slides[i], () => { if (eventTriggered || !s) return; @@ -237,7 +237,7 @@ export const SWIPER_EFFECTS: SlideEffects = { var zFactor = (isSafari(plt) || isIosUIWebView(plt)) ? (-s._renderedSize / 2) : 0; transform(s._wrapper, 'translate3d(0px,0,' + zFactor + 'px) rotateX(' + (isHorizontal(s) ? 0 : wrapperRotate) + 'deg) rotateY(' + (isHorizontal(s) ? -wrapperRotate : 0) + 'deg)'); }, - setTransition: function (s, plt, duration) { + setTransition: function (s, _plt, duration) { for (var i = 0; i < s._slides.length; i++) { var slide = s._slides[i]; transition(slide, duration); @@ -315,7 +315,7 @@ export const SWIPER_EFFECTS: SlideEffects = { } } }, - setTransition: function (s, plt, duration) { + setTransition: function (s, _plt, duration) { for (var i = 0; i < s._slides.length; i++) { var slide = s._slides[i]; transition(slide, duration); diff --git a/src/components/slides/swiper/swiper-events.ts b/src/components/slides/swiper/swiper-events.ts index 8a9623d620..6d74fbcc9d 100644 --- a/src/components/slides/swiper/swiper-events.ts +++ b/src/components/slides/swiper/swiper-events.ts @@ -1,8 +1,22 @@ import { Slides } from '../slides'; -import { SlideUIEvent, SlideElement } from './swiper-interfaces'; -import { maxTranslate, minTranslate, isFormElement, isHorizontal, getElementIndex, triggerTransitionEnd, CLS } from './swiper-utils'; -import { getWrapperTranslate, setWrapperTranslate, setWrapperTransition } from './swiper-transition'; -import { currentSlidesPerView, fixLoop, slideNext, slidePrev, slideTo, slideReset, stopAutoplay, pauseAutoplay, updateAutoHeight, updateContainerSize, updateSlidesSize, onTransitionStart, onTransitionEnd } from './swiper'; +import { SlideElement, SlideUIEvent } from './swiper-interfaces'; +import { CLS, getElementIndex, isFormElement, isHorizontal, maxTranslate, minTranslate, triggerTransitionEnd, } from './swiper-utils'; +import { getWrapperTranslate, setWrapperTransition, setWrapperTranslate } from './swiper-transition'; +import { + currentSlidesPerView, + fixLoop, + onTransitionEnd, + onTransitionStart, + pauseAutoplay, + slideNext, + slidePrev, + slideReset, + slideTo, + stopAutoplay, + updateAutoHeight, + updateContainerSize, + updateSlidesSize, +} from './swiper'; import { updateProgress } from './swiper-progress'; import { updateActiveIndex } from './swiper-index'; import { updatePagination } from './swiper-pagination'; diff --git a/src/components/slides/swiper/swiper-keyboard.ts b/src/components/slides/swiper/swiper-keyboard.ts index 0c05edae00..469ae2e622 100755 --- a/src/components/slides/swiper/swiper-keyboard.ts +++ b/src/components/slides/swiper/swiper-keyboard.ts @@ -1,6 +1,6 @@ import { Slides } from '../slides'; import { Platform } from '../../../platform/platform'; -import { isHorizontal, offset, CLS } from './swiper-utils'; +import { CLS, isHorizontal, offset } from './swiper-utils'; import { slideNext, slidePrev } from './swiper'; diff --git a/src/components/slides/swiper/swiper-pagination.ts b/src/components/slides/swiper/swiper-pagination.ts index 8a1e82793f..c57419bfa1 100644 --- a/src/components/slides/swiper/swiper-pagination.ts +++ b/src/components/slides/swiper/swiper-pagination.ts @@ -1,4 +1,4 @@ -import { addClass, eachChild, isHorizontal, removeClass, transform, transition, CLS } from './swiper-utils'; +import { CLS, addClass, eachChild, isHorizontal, removeClass, transform, transition } from './swiper-utils'; import { Slides } from '../slides'; diff --git a/src/components/slides/swiper/swiper-progress.ts b/src/components/slides/swiper/swiper-progress.ts index b36b9e0f5a..7d2c63143e 100644 --- a/src/components/slides/swiper/swiper-progress.ts +++ b/src/components/slides/swiper/swiper-progress.ts @@ -1,5 +1,5 @@ import { Slides } from '../slides'; -import { maxTranslate, minTranslate, removeClass, updateSlidesOffset, CLS } from './swiper-utils'; +import { CLS, maxTranslate, minTranslate, removeClass, updateSlidesOffset } from './swiper-utils'; export function updateProgress(s: Slides, translate?: number) { diff --git a/src/components/slides/swiper/swiper-transition.ts b/src/components/slides/swiper/swiper-transition.ts index 8667a9b589..036d85f84e 100644 --- a/src/components/slides/swiper/swiper-transition.ts +++ b/src/components/slides/swiper/swiper-transition.ts @@ -1,5 +1,5 @@ import { Slides } from '../slides'; -import { isHorizontal, round, transform, transition, maxTranslate, minTranslate } from './swiper-utils'; +import { isHorizontal, maxTranslate, minTranslate, round, transform, transition } from './swiper-utils'; import { parallaxSetTransition, parallaxSetTranslate } from './swiper-parallax'; import { Platform } from '../../../platform/platform'; import { updateProgress } from './swiper-progress'; diff --git a/src/components/slides/swiper/swiper-utils.ts b/src/components/slides/swiper/swiper-utils.ts index 423b5cca19..4802f9f0c1 100644 --- a/src/components/slides/swiper/swiper-utils.ts +++ b/src/components/slides/swiper/swiper-utils.ts @@ -15,7 +15,7 @@ export function inlineStyle(ele: any, styles: any) { } else if (ele.nodeType) { var cssProps = Object.keys(styles); - for (var i = 0; i < cssProps.length; i++) { + for (let i = 0; i < cssProps.length; i++) { ele.style[cssProps[i]] = styles[cssProps[i]]; } } diff --git a/src/components/slides/swiper/swiper-zoom.ts b/src/components/slides/swiper/swiper-zoom.ts index 3c3936d055..51c4c39b0f 100644 --- a/src/components/slides/swiper/swiper-zoom.ts +++ b/src/components/slides/swiper/swiper-zoom.ts @@ -1,6 +1,6 @@ import { Slides } from '../slides'; import { Platform } from '../../../platform/platform'; -import { transition, transform, isHorizontal, offset, CLS } from './swiper-utils'; +import { CLS, isHorizontal, offset, transform, transition } from './swiper-utils'; import { getTranslate } from './swiper-transition'; import { SlideElement } from './swiper-interfaces'; @@ -69,7 +69,7 @@ function getDistanceBetweenTouches(ev: TouchEvent) { // Events -function onGestureStart(s: Slides, plt: Platform, ev: TouchEvent) { +function onGestureStart(s: Slides, _plt: Platform, ev: TouchEvent) { const z = s._zoom; s.originalEvent = ev; @@ -105,7 +105,7 @@ function onGestureStart(s: Slides, plt: Platform, ev: TouchEvent) { } -function onGestureChange(s: Slides, plt: Platform, ev: TouchEvent) { +function onGestureChange(s: Slides, _plt: Platform, ev: TouchEvent) { const z = s._zoom; s.originalEvent = ev; @@ -137,7 +137,7 @@ function onGestureChange(s: Slides, plt: Platform, ev: TouchEvent) { } -function onGestureEnd(s: Slides, plt: Platform, ev: TouchEvent) { +function onGestureEnd(s: Slides, _plt: Platform, ev: TouchEvent) { const z = s._zoom; s.originalEvent = ev; @@ -481,7 +481,7 @@ export function resetZoomEvents(s: Slides, plt: Platform) { } } else if (s._touchEvents.start === 'touchstart') { - for (var i = 0; i < slides.length; i++) { + for (let i = 0; i < slides.length; i++) { slide = slides[i]; // touchstart plt.registerListener(slide, s._touchEvents.start, (ev: TouchEvent) => { @@ -506,7 +506,7 @@ export function resetZoomEvents(s: Slides, plt: Platform) { }); unRegs.push(() => { touchStartSub.unsubscribe(); }); - for (var i = 0; i < slides.length; i++) { + for (let i = 0; i < slides.length; i++) { slide = slides[i]; if (slide.querySelector('.' + CLS.zoomContainer)) { plt.registerListener(slide, 's.touchEvents.move', (ev: TouchEvent) => { diff --git a/src/components/slides/swiper/swiper.ts b/src/components/slides/swiper/swiper.ts index bc8c7beae9..0f8ca1484b 100644 --- a/src/components/slides/swiper/swiper.ts +++ b/src/components/slides/swiper/swiper.ts @@ -14,9 +14,9 @@ import { SlideElement } from './swiper-interfaces'; import { Platform } from '../../../platform/platform'; -import { maxTranslate, minTranslate, addClass, eachChild, inlineStyle, removeClass, isHorizontal, round, updateSlidesOffset, CLS } from './swiper-utils'; +import { CLS, addClass, eachChild, inlineStyle, isHorizontal, maxTranslate, minTranslate, removeClass, round, updateSlidesOffset } from './swiper-utils'; import { Slides } from '../slides'; -import { setWrapperTranslate, setWrapperTransition } from './swiper-transition'; +import { setWrapperTransition, setWrapperTranslate } from './swiper-transition'; import { updateProgress } from './swiper-progress'; import { updateClasses } from './swiper-classes'; import { parallaxSetTranslate } from './swiper-parallax'; @@ -926,7 +926,7 @@ function cleanupStyles(s: Slides) { // Buttons removeClass(s.prevButton, CLS.buttonDisabled); removeClass(s.nextButton, CLS.buttonDisabled); -}; +} // Destroy diff --git a/src/components/slides/test/basic/app.module.ts b/src/components/slides/test/basic/app.module.ts index c480b5430e..26d07b21f3 100644 --- a/src/components/slides/test/basic/app.module.ts +++ b/src/components/slides/test/basic/app.module.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; +import { Component, NgModule, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { IonicApp, IonicModule, Slides } from '../../../..'; diff --git a/src/components/slides/test/control/app.module.ts b/src/components/slides/test/control/app.module.ts index fa91ab3f66..2317f74401 100644 --- a/src/components/slides/test/control/app.module.ts +++ b/src/components/slides/test/control/app.module.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; +import { Component, NgModule, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { IonicApp, IonicModule, Slides } from '../../../..'; diff --git a/src/components/slides/test/controller/app.module.ts b/src/components/slides/test/controller/app.module.ts index 85963772a0..1d102ff16e 100644 --- a/src/components/slides/test/controller/app.module.ts +++ b/src/components/slides/test/controller/app.module.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; +import { Component, NgModule, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { IonicApp, IonicModule, Slides } from '../../../..'; diff --git a/src/components/slides/test/images/app.module.ts b/src/components/slides/test/images/app.module.ts index eb0a88b16e..a045491444 100644 --- a/src/components/slides/test/images/app.module.ts +++ b/src/components/slides/test/images/app.module.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; +import { Component, NgModule, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { Http } from '@angular/http'; diff --git a/src/components/slides/test/loop/app.module.ts b/src/components/slides/test/loop/app.module.ts index d1ce12c398..90071847cf 100644 --- a/src/components/slides/test/loop/app.module.ts +++ b/src/components/slides/test/loop/app.module.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; +import { Component, NgModule, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { IonicApp, IonicModule, Slides } from '../../../..'; diff --git a/src/components/slides/test/options/app.module.ts b/src/components/slides/test/options/app.module.ts index bbd9268d35..a59a30aff3 100644 --- a/src/components/slides/test/options/app.module.ts +++ b/src/components/slides/test/options/app.module.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; +import { Component, NgModule, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { IonicApp, IonicModule, Slides } from '../../../..'; diff --git a/src/components/slides/test/rtl/app.module.ts b/src/components/slides/test/rtl/app.module.ts index 304f00b2bb..c480d67c76 100644 --- a/src/components/slides/test/rtl/app.module.ts +++ b/src/components/slides/test/rtl/app.module.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; +import { Component, NgModule, ViewChild } from '@angular/core'; import { IonicApp, IonicModule, Slides } from '../../../..'; diff --git a/src/components/snapshot/test/basic/pages/components/components.ts b/src/components/snapshot/test/basic/pages/components/components.ts index 17e75a4fac..b7b630c468 100644 --- a/src/components/snapshot/test/basic/pages/components/components.ts +++ b/src/components/snapshot/test/basic/pages/components/components.ts @@ -560,7 +560,7 @@ export class ComponentsPage { } ]; - constructor(private navCtrl: NavController, private assistive: AssistiveTouchProvider) { + constructor(private navCtrl: NavController, assistive: AssistiveTouchProvider) { assistive.closeButton.subscribe(this.close.bind(this)); } diff --git a/src/components/spinner/spinner.ts b/src/components/spinner/spinner.ts index d43b42a9a8..b60a5e44e1 100644 --- a/src/components/spinner/spinner.ts +++ b/src/components/spinner/spinner.ts @@ -181,12 +181,12 @@ export class Spinner extends Ion { const spinner = SPINNERS[name]; if (spinner) { if (spinner.lines) { - for (var i = 0, l = spinner.lines; i < l; i++) { + for (let i = 0, l = spinner.lines; i < l; i++) { this._l.push(this._loadEle(spinner, i, l)); } } else if (spinner.circles) { - for (var i = 0, l = spinner.circles; i < l; i++) { + for (let i = 0, l = spinner.circles; i < l; i++) { this._c.push(this._loadEle(spinner, i, l)); } } @@ -294,7 +294,7 @@ const SPINNERS: any = { dots: { dur: 750, circles: 3, - fn: function (dur: number, index: number) { + fn: function (_dur: number, index: number) { const animationDelay = -(110 * index) + 'ms'; return { r: 6, diff --git a/src/components/split-pane/split-pane.ts b/src/components/split-pane/split-pane.ts index e9e43188aa..0ce42933f0 100644 --- a/src/components/split-pane/split-pane.ts +++ b/src/components/split-pane/split-pane.ts @@ -1,6 +1,6 @@ -import { ContentChildren, Directive, ElementRef, EventEmitter, forwardRef, Input, Output, QueryList, NgZone, Renderer } from '@angular/core'; +import { ContentChildren, Directive, ElementRef, EventEmitter, Input, NgZone, Output, QueryList, Renderer, forwardRef } from '@angular/core'; import { Ion } from '../ion'; -import { isTrueProperty, assert } from '../../util/util'; +import { assert, isTrueProperty } from '../../util/util'; import { Config } from '../../config/config'; import { Platform } from '../../platform/platform'; diff --git a/src/components/tabs/tab.ts b/src/components/tabs/tab.ts index 45c3b53ab8..d68fc6e1c6 100644 --- a/src/components/tabs/tab.ts +++ b/src/components/tabs/tab.ts @@ -1,4 +1,4 @@ -import { ChangeDetectorRef, Component, ComponentFactoryResolver, ComponentRef, ElementRef, ErrorHandler, EventEmitter, Input, NgZone, Optional, Output, Renderer, ViewChild, ViewEncapsulation, ViewContainerRef } from '@angular/core'; +import { ChangeDetectorRef, Component, ComponentFactoryResolver, ComponentRef, ElementRef, ErrorHandler, EventEmitter, Input, NgZone, Optional, Output, Renderer, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core'; import { App } from '../app/app'; import { Config } from '../../config/config'; diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts index 811d12d6fb..15fd28a2a2 100644 --- a/src/components/tabs/tabs.ts +++ b/src/components/tabs/tabs.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, ElementRef, EventEmitter, forwardRef, Input, Output, Optional, Renderer, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, EventEmitter, Input, Optional, Output, Renderer, ViewChild, ViewContainerRef, ViewEncapsulation, forwardRef } from '@angular/core'; import { Subject } from 'rxjs/Subject'; import 'rxjs/add/operator/takeUntil'; @@ -13,7 +13,7 @@ import { Tabs as ITabs } from '../../navigation/nav-interfaces'; import { NavController } from '../../navigation/nav-controller'; import { NavControllerBase } from '../../navigation/nav-controller-base'; import { NavigationContainer } from '../../navigation/navigation-container'; -import { getComponent, NavOptions, DIRECTION_SWITCH } from '../../navigation/nav-util'; +import { DIRECTION_SWITCH, NavOptions, getComponent } from '../../navigation/nav-util'; import { formatUrlPart } from '../../navigation/url-serializer'; import { RootNode } from '../split-pane/split-pane'; import { Platform } from '../../platform/platform'; @@ -414,7 +414,7 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs, Navigat selectedTab.load(opts, () => { this._tabSwitchEnd(selectedTab, selectedPage, currentPage); if (opts.updateUrl !== false) { - this._linker.navChange(this.id, DIRECTION_SWITCH); + this._linker.navChange(DIRECTION_SWITCH); } assert(this.getSelected() === selectedTab, 'selected tab does not match'); this._fireChangeEvent(selectedTab); diff --git a/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts b/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts index df84b044ab..85af94da2b 100644 --- a/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts +++ b/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts @@ -1,5 +1,5 @@ import { Component, ViewChild } from '@angular/core'; -import { AlertController, IonicPage, NavController, NavParams, ModalController, Tabs, Tab } from '../../../../../..'; +import { AlertController, IonicPage, ModalController, NavController, NavParams, Tab, Tabs } from '../../../../../..'; @IonicPage({ name: 'tabs-page' diff --git a/src/components/tabs/test/basic/pages/tab-three/tab-three.ts b/src/components/tabs/test/basic/pages/tab-three/tab-three.ts index a2ea8659c9..77e0f02454 100644 --- a/src/components/tabs/test/basic/pages/tab-three/tab-three.ts +++ b/src/components/tabs/test/basic/pages/tab-three/tab-three.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { App, AlertController, IonicPage, ModalController, Tabs } from '../../../../../..'; +import { AlertController, App, IonicPage, ModalController, Tabs } from '../../../../../..'; @IonicPage() @Component({ diff --git a/src/components/tabs/test/events/app.module.ts b/src/components/tabs/test/events/app.module.ts index 3fdfe6106e..19ddb184f5 100644 --- a/src/components/tabs/test/events/app.module.ts +++ b/src/components/tabs/test/events/app.module.ts @@ -1,6 +1,6 @@ import { Component, NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { IonicApp, IonicModule, Events } from '../../../..'; +import { Events, IonicApp, IonicModule } from '../../../..'; // // Tab 1 diff --git a/src/components/tabs/test/ghost/app.module.ts b/src/components/tabs/test/ghost/app.module.ts index 115009b845..d694520e3d 100644 --- a/src/components/tabs/test/ghost/app.module.ts +++ b/src/components/tabs/test/ghost/app.module.ts @@ -1,4 +1,4 @@ -import { Component, QueryList, ViewChildren, NgModule } from '@angular/core'; +import { Component, NgModule, QueryList, ViewChildren } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { IonicApp, IonicModule, Tab } from '../../../..'; diff --git a/src/components/tabs/test/lifecyles/app.module.ts b/src/components/tabs/test/lifecyles/app.module.ts index 734498c4d3..7b308cf896 100644 --- a/src/components/tabs/test/lifecyles/app.module.ts +++ b/src/components/tabs/test/lifecyles/app.module.ts @@ -1,6 +1,6 @@ import { Component, NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { IonicApp, IonicModule, NavController, AlertController } from '../../../..'; +import { AlertController, IonicApp, IonicModule, NavController } from '../../../..'; // // Tab 1 diff --git a/src/components/toast/test/basic/pages/page-one/page-one.ts b/src/components/toast/test/basic/pages/page-one/page-one.ts index 914749b42b..3b430e66ec 100644 --- a/src/components/toast/test/basic/pages/page-one/page-one.ts +++ b/src/components/toast/test/basic/pages/page-one/page-one.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { IonicPage, NavController, Toast, ToastController } from '../../../../../..'; +import { IonicPage, NavController, ToastController } from '../../../../../..'; @IonicPage() @Component({ @@ -72,7 +72,7 @@ export class PageOne { }, 1000); } - private dismissHandler(toast: Toast) { + private dismissHandler() { console.info('Toast onDidDismiss()'); } diff --git a/src/components/toast/toast.ts b/src/components/toast/toast.ts index 9fe370491a..7f9da92c45 100644 --- a/src/components/toast/toast.ts +++ b/src/components/toast/toast.ts @@ -5,7 +5,7 @@ import { NavOptions } from '../../navigation/nav-util'; import { PORTAL_TOAST } from '../app/app-constants'; import { ToastCmp } from './toast-component'; import { ToastOptions } from './toast-options'; -import { ToastSlideIn, ToastSlideOut, ToastMdSlideIn, ToastMdSlideOut, ToastWpPopOut, ToastWpPopIn } from './toast-transitions'; +import { ToastMdSlideIn, ToastMdSlideOut, ToastSlideIn, ToastSlideOut, ToastWpPopIn, ToastWpPopOut } from './toast-transitions'; import { ViewController } from '../../navigation/view-controller'; diff --git a/src/components/toggle/test/toggle.spec.ts b/src/components/toggle/test/toggle.spec.ts index 7e59bbcd24..f20944db80 100644 --- a/src/components/toggle/test/toggle.spec.ts +++ b/src/components/toggle/test/toggle.spec.ts @@ -1,6 +1,6 @@ import { Toggle } from '../toggle'; -import { mockConfig, mockPlatform, mockHaptic, mockElementRef, mockGestureController, mockRenderer, mockItem, mockForm, mockZone } from '../../../util/mock-providers'; -import { commonInputTest, BOOLEAN_CORPUS } from '../../../util/input-tester'; +import { mockConfig, mockElementRef, mockForm, mockGestureController, mockHaptic, mockItem, mockPlatform, mockRenderer, mockZone } from '../../../util/mock-providers'; +import { BOOLEAN_CORPUS, commonInputTest } from '../../../util/input-tester'; describe('Toggle', () => { diff --git a/src/components/toggle/toggle-gesture.ts b/src/components/toggle/toggle-gesture.ts index 3d28d2b4b1..5d74965b5a 100644 --- a/src/components/toggle/toggle-gesture.ts +++ b/src/components/toggle/toggle-gesture.ts @@ -1,4 +1,4 @@ -import { GestureController, GESTURE_PRIORITY_TOGGLE, GESTURE_TOGGLE } from '../../gestures/gesture-controller'; +import { GESTURE_PRIORITY_TOGGLE, GESTURE_TOGGLE, GestureController } from '../../gestures/gesture-controller'; import { DomController } from '../../platform/dom-controller'; import { PanGesture } from '../../gestures/pan-gesture'; import { Platform } from '../../platform/platform'; diff --git a/src/components/toggle/toggle.ts b/src/components/toggle/toggle.ts index 7d63f2ca79..d5ff79d1cc 100644 --- a/src/components/toggle/toggle.ts +++ b/src/components/toggle/toggle.ts @@ -1,4 +1,4 @@ -import { AfterContentInit, NgZone, Component, ElementRef, HostListener, Input, OnDestroy, Optional, Renderer, ViewEncapsulation } from '@angular/core'; +import { AfterContentInit, Component, ElementRef, HostListener, Input, NgZone, OnDestroy, Optional, Renderer, ViewEncapsulation } from '@angular/core'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { Config } from '../../config/config'; diff --git a/src/components/toolbar/toolbar-item.ts b/src/components/toolbar/toolbar-item.ts index c5aa3c026a..1825c9036d 100644 --- a/src/components/toolbar/toolbar-item.ts +++ b/src/components/toolbar/toolbar-item.ts @@ -1,4 +1,4 @@ -import { ContentChildren, Directive, ElementRef, forwardRef, Optional, Inject, Renderer } from '@angular/core'; +import { ContentChildren, Directive, ElementRef, Inject, Optional, Renderer, forwardRef } from '@angular/core'; import { Button } from '../button/button'; import { Config } from '../../config/config'; diff --git a/src/components/toolbar/toolbar-title.ts b/src/components/toolbar/toolbar-title.ts index 38a4e3d239..e24c9d8e15 100644 --- a/src/components/toolbar/toolbar-title.ts +++ b/src/components/toolbar/toolbar-title.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, ElementRef, forwardRef, Optional, Inject, Renderer, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ElementRef, Inject, Optional, Renderer, ViewEncapsulation, forwardRef, } from '@angular/core'; import { Config } from '../../config/config'; import { Ion } from '../ion'; diff --git a/src/components/virtual-scroll/test/basic/app.module.ts b/src/components/virtual-scroll/test/basic/app.module.ts index 9faa4cbee5..13b70cdc7f 100644 --- a/src/components/virtual-scroll/test/basic/app.module.ts +++ b/src/components/virtual-scroll/test/basic/app.module.ts @@ -1,6 +1,6 @@ import { Component, NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { IonicApp, IonicModule, NavController, Platform } from '../../../..'; +import { IonicApp, IonicModule, NavController } from '../../../..'; @Component({ @@ -11,7 +11,7 @@ export class E2EPage { webview: string = ''; counter: number = 0; - constructor(plt: Platform, public navCtrl: NavController) {} + constructor(public navCtrl: NavController) {} addItems() { if (this.items.length === 0) { @@ -21,7 +21,7 @@ export class E2EPage { } } - headerFn(record: any, index: number, records: any[]) { + headerFn(_record: any, index: number, _records: any[]) { if (index % 4 === 0) { return index + ' is divisible by 4'; } @@ -59,7 +59,7 @@ export class E2EPage { this.items[index] = { value: Math.floor(Math.random() * 10000), someMethod: () => '!!' }; } - trackByFn(index: number, item: any) { + trackByFn(_index: number, item: any) { return item.value; } diff --git a/src/components/virtual-scroll/test/cards/app.module.ts b/src/components/virtual-scroll/test/cards/app.module.ts index ecff4814ef..14c1a5bb65 100644 --- a/src/components/virtual-scroll/test/cards/app.module.ts +++ b/src/components/virtual-scroll/test/cards/app.module.ts @@ -1,4 +1,4 @@ -import { Component, ViewEncapsulation, NgModule } from '@angular/core'; +import { Component, NgModule, ViewEncapsulation } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { IonicApp, IonicModule } from '../../../..'; diff --git a/src/components/virtual-scroll/test/image-gallery/app.module.ts b/src/components/virtual-scroll/test/image-gallery/app.module.ts index bc5ce02545..034a1fe5aa 100644 --- a/src/components/virtual-scroll/test/image-gallery/app.module.ts +++ b/src/components/virtual-scroll/test/image-gallery/app.module.ts @@ -1,4 +1,4 @@ -import { Component, ViewEncapsulation, NgModule } from '@angular/core'; +import { Component, NgModule, ViewEncapsulation } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { IonicApp, IonicModule } from '../../../..'; @@ -37,7 +37,7 @@ export class E2EPage { } } - headerFn(record: any, recordIndex: number, records: any[]) { + headerFn(record: any) { if (this.lastMonth !== record.date.getMonth()) { this.lastMonth = record.date.getMonth(); @@ -49,7 +49,7 @@ export class E2EPage { return null; } - footerFn(record: any, recordIndex: number, records: any[]) { + footerFn(_record: any, recordIndex: number, records: any[]) { if (recordIndex === records.length - 1) { return true; diff --git a/src/components/virtual-scroll/test/sliding-item/app.module.ts b/src/components/virtual-scroll/test/sliding-item/app.module.ts index bdcdd00fd0..0ed1cabc26 100644 --- a/src/components/virtual-scroll/test/sliding-item/app.module.ts +++ b/src/components/virtual-scroll/test/sliding-item/app.module.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, ElementRef, NgModule } from '@angular/core'; +import { Component, ElementRef, NgModule, ViewChild } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { IonicApp, IonicModule, Platform } from '../../../..'; @@ -32,7 +32,7 @@ export class E2EPage { } } - headerFn(record: any, index: number, records: any[]) { + headerFn(_record: any, index: number) { if (index % 4 === 0) { return index + ' is divisible by 4'; } diff --git a/src/components/virtual-scroll/test/variable-size/app.module.ts b/src/components/virtual-scroll/test/variable-size/app.module.ts index 49eaf4272d..1bedcff2e5 100644 --- a/src/components/virtual-scroll/test/variable-size/app.module.ts +++ b/src/components/virtual-scroll/test/variable-size/app.module.ts @@ -22,7 +22,7 @@ export class E2EPage { } } - headerFn(record: any, recordIndex: number) { + headerFn(_record: any, recordIndex: number) { if (recordIndex > 0 && recordIndex % 100 === 0) { return recordIndex; } diff --git a/src/components/virtual-scroll/test/virtual-scroll.spec.ts b/src/components/virtual-scroll/test/virtual-scroll.spec.ts index 2d7d3fa1a3..c0b59f40e6 100644 --- a/src/components/virtual-scroll/test/virtual-scroll.spec.ts +++ b/src/components/virtual-scroll/test/virtual-scroll.spec.ts @@ -1,5 +1,5 @@ import { VirtualCell, VirtualData, VirtualNode } from '../virtual-util'; -import { processRecords, populateNodeData, initReadNodes, getVirtualHeight, adjustRendered, estimateHeight } from '../virtual-util'; +import { adjustRendered, estimateHeight, getVirtualHeight, initReadNodes, populateNodeData, processRecords } from '../virtual-util'; import { mockPlatform } from '../../../util/mock-providers'; @@ -22,7 +22,7 @@ describe('VirtualScroll', () => { ftrWidth: viewportWidth, ftrHeight: HEIGHT_FOOTER }; - window.getComputedStyle = function(element) { + window.getComputedStyle = function() { var styles: any = { marginTop: '0px', marginRight: '0px', @@ -229,7 +229,7 @@ describe('VirtualScroll', () => { let startCellIndex = 0; let endCellIndex = 0; - populateNodeData(startCellIndex, endCellIndex, data.viewWidth, true, + populateNodeData(startCellIndex, endCellIndex, true, cells, records, nodes, viewContainer, itmTmp, hdrTmp, ftrTmp, false); @@ -257,7 +257,7 @@ describe('VirtualScroll', () => { let startCellIndex = 2; let endCellIndex = 5; - populateNodeData(startCellIndex, endCellIndex, data.viewWidth, true, + populateNodeData(startCellIndex, endCellIndex, true, cells, records, nodes, viewContainer, itmTmp, hdrTmp, ftrTmp, false); @@ -286,7 +286,7 @@ describe('VirtualScroll', () => { let startCellIndex = 2; let endCellIndex = 4; - populateNodeData(startCellIndex, endCellIndex, data.viewWidth, true, + populateNodeData(startCellIndex, endCellIndex, true, cells, records, nodes, viewContainer, itmTmp, hdrTmp, ftrTmp, true); diff --git a/src/components/virtual-scroll/virtual-scroll.ts b/src/components/virtual-scroll/virtual-scroll.ts index 88bf65ba80..6f3d11bfee 100644 --- a/src/components/virtual-scroll/virtual-scroll.ts +++ b/src/components/virtual-scroll/virtual-scroll.ts @@ -1,10 +1,10 @@ import { AfterContentInit, ChangeDetectorRef, ContentChild, Directive, DoCheck, ElementRef, Input, IterableChanges, IterableDiffer, IterableDiffers, NgZone, OnDestroy, Renderer, TrackByFn } from '@angular/core'; -import { adjustRendered, calcDimensions, estimateHeight, initReadNodes, processRecords, populateNodeData, updateDimensions, updateNodeContext, writeToNodes } from './virtual-util'; +import { adjustRendered, calcDimensions, estimateHeight, initReadNodes, populateNodeData, processRecords, updateDimensions, updateNodeContext, writeToNodes } from './virtual-util'; import { Config } from '../../config/config'; import { Content, ScrollEvent } from '../content/content'; import { DomController } from '../../platform/dom-controller'; -import { isFunction, isPresent, assert } from '../../util/util'; +import { assert, isFunction, isPresent } from '../../util/util'; import { Platform } from '../../platform/platform'; import { ViewController } from '../../navigation/view-controller'; import { VirtualCell, VirtualData, VirtualNode } from './virtual-util'; @@ -556,7 +556,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy { this._zone.run(() => { populateNodeData( data.topCell, data.bottomCell, - data.viewWidth, true, + true, cells, records, nodes, this._itmTmp.viewContainer, this._itmTmp.templateRef, @@ -694,7 +694,7 @@ export class VirtualScroll implements DoCheck, AfterContentInit, OnDestroy { var hasChanges = populateNodeData( data.topCell, data.bottomCell, - data.viewWidth, diff > 0, + diff > 0, cells, records, nodes, this._itmTmp.viewContainer, this._itmTmp.templateRef, diff --git a/src/components/virtual-scroll/virtual-util.ts b/src/components/virtual-scroll/virtual-util.ts index 0bf9011d3c..9dcd614de3 100644 --- a/src/components/virtual-scroll/virtual-util.ts +++ b/src/components/virtual-scroll/virtual-util.ts @@ -1,4 +1,4 @@ -import { ViewContainerRef, TemplateRef, EmbeddedViewRef } from '@angular/core'; +import { EmbeddedViewRef, TemplateRef, ViewContainerRef } from '@angular/core'; import { Platform } from '../../platform/platform'; @@ -127,7 +127,7 @@ function addCell(previousCell: VirtualCell, recordIndex: number, tmpl: number, t /** * NO DOM */ -export function populateNodeData(startCellIndex: number, endCellIndex: number, viewportWidth: number, scrollingDown: boolean, +export function populateNodeData(startCellIndex: number, endCellIndex: number, scrollingDown: boolean, cells: VirtualCell[], records: any[], nodes: VirtualNode[], viewContainer: ViewContainerRef, itmTmp: TemplateRef, hdrTmp: TemplateRef, ftrTmp: TemplateRef, initialLoad: boolean): boolean { @@ -330,7 +330,7 @@ export function updateDimensions(plt: Platform, nodes: VirtualNode[], cells: Vir tmpl: -1 }; - for (var i = 0; i < totalCells; i++) { + for (let i = 0; i < totalCells; i++) { cell = cells[i]; if (previousCell.left + previousCell.width + cell.width > data.viewWidth) { @@ -481,7 +481,7 @@ export function adjustRendered(cells: VirtualCell[], data: VirtualData) { data.bottomCell = Math.min(data.bottomViewCell + viewableRenderedPadding, totalCells - 1); data.topCell = Math.max(data.bottomCell - 2, 0); - for (var i = data.bottomCell; i >= 0; i--) { + for (let i = data.bottomCell; i >= 0; i--) { cell = cells[i]; if (cell.row !== lastRow) { cellsRenderHeight += cell.height; @@ -599,7 +599,7 @@ function calcWidth(viewportWidth: number, approxWidth: string): number { /** * NO DOM */ -function calcHeight(viewportHeight: number, approxHeight: string): number { +function calcHeight(_viewportHeight: number, approxHeight: string): number { if (approxHeight.indexOf('px') > 0) { return parseFloat(approxHeight); } diff --git a/src/config/config.ts b/src/config/config.ts index c3725fc18d..5adcfaf511 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -8,7 +8,7 @@ import { OpaqueToken } from '@angular/core'; * Config allows you to set the modes of your components */ import { Platform } from '../platform/platform'; -import { isObject, isDefined, isFunction, isArray } from '../util/util'; +import { isArray, isDefined, isFunction, isObject } from '../util/util'; /** * @name Config diff --git a/src/gestures/gesture-controller.ts b/src/gestures/gesture-controller.ts index a569bf66d2..d8fd11ec4f 100644 --- a/src/gestures/gesture-controller.ts +++ b/src/gestures/gesture-controller.ts @@ -1,4 +1,4 @@ -import { forwardRef, Inject, Injectable } from '@angular/core'; +import { Inject, Injectable, forwardRef } from '@angular/core'; import { App } from '../components/app/app'; import { assert } from '../util/util'; diff --git a/src/gestures/gesture.ts b/src/gestures/gesture.ts index 761b7fb280..c8f388bbac 100644 --- a/src/gestures/gesture.ts +++ b/src/gestures/gesture.ts @@ -1,5 +1,5 @@ import { defaults } from '../util/util'; -import { Hammer, DIRECTION_HORIZONTAL, DIRECTION_VERTICAL } from './hammer'; +import { DIRECTION_HORIZONTAL, DIRECTION_VERTICAL, Hammer } from './hammer'; /** * @hidden diff --git a/src/gestures/hammer.ts b/src/gestures/hammer.ts index 2e76adf4c8..3262561b7a 100644 --- a/src/gestures/hammer.ts +++ b/src/gestures/hammer.ts @@ -706,7 +706,7 @@ var MOUSE_WINDOW_EVENTS = 'mousemove mouseup'; * @constructor * @extends Input */ -function MouseInput(manager: any, handler: any) { +function MouseInput(_manager: any, _handler: any) { this.evEl = MOUSE_ELEMENT_EVENTS; this.evWin = MOUSE_WINDOW_EVENTS; @@ -923,7 +923,7 @@ var TOUCH_TARGET_EVENTS = 'touchstart touchmove touchend touchcancel'; * @constructor * @extends Input */ -function TouchInput(manager: any, handler: any): void { +function TouchInput(_manager: any, _handler: any): void { this.evTarget = TOUCH_TARGET_EVENTS; this.targetIds = {}; @@ -1476,7 +1476,7 @@ Recognizer.prototype = { * @param {Object} inputData * @returns {Const} STATE */ - process: function(inputData: any) { }, // jshint ignore:line + process: function(_inputData: any) { }, // jshint ignore:line /** * return the preferred touch-action @@ -2008,10 +2008,6 @@ function Hammer(element: any, options: any): any { return new (Manager)(element, options); } -/** - * @const {string} - */ -var VERSION = '2.0.6'; /** * default settings diff --git a/src/gestures/pan-gesture.ts b/src/gestures/pan-gesture.ts index 272ea283dc..6446869e39 100644 --- a/src/gestures/pan-gesture.ts +++ b/src/gestures/pan-gesture.ts @@ -1,5 +1,5 @@ import { assert, defaults } from '../util/util'; -import { DomDebouncer, DomController } from '../platform/dom-controller'; +import { DomController, DomDebouncer } from '../platform/dom-controller'; import { GestureDelegate } from './gesture-controller'; import { PanRecognizer } from './recognizers'; import { Platform } from '../platform/platform'; @@ -168,11 +168,11 @@ export class PanGesture { } // Implemented in a subclass - canStart(ev: any): boolean { return true; } - onDragStart(ev: any) { } - onDragMove(ev: any) { } - onDragEnd(ev: any) { } - notCaptured(ev: any) { } + canStart(_ev: any): boolean { return true; } + onDragStart(_ev: any) { } + onDragMove(_ev: any) { } + onDragEnd(_ev: any) { } + notCaptured(_ev: any) { } } diff --git a/src/gestures/pointer-events.ts b/src/gestures/pointer-events.ts index cd8806ffa0..974e6e8d6d 100644 --- a/src/gestures/pointer-events.ts +++ b/src/gestures/pointer-events.ts @@ -1,5 +1,5 @@ import { assert } from '../util/util'; -import { Platform, EventListenerOptions } from '../platform/platform'; +import { EventListenerOptions, Platform } from '../platform/platform'; /** * @hidden diff --git a/src/gestures/slide-gesture.ts b/src/gestures/slide-gesture.ts index c49701aa78..6a0c719766 100644 --- a/src/gestures/slide-gesture.ts +++ b/src/gestures/slide-gesture.ts @@ -1,5 +1,5 @@ import { PanGesture } from './pan-gesture'; -import { clamp, assert } from '../util/util'; +import { assert, clamp } from '../util/util'; import { Platform } from '../platform/platform'; import { pointerCoord } from '../util/dom'; @@ -17,7 +17,7 @@ export class SlideGesture extends PanGesture { * Get the min and max for the slide. pageX/pageY. * Only called on dragstart. */ - getSlideBoundaries(slide: SlideData, ev: any) { + getSlideBoundaries(_slide: SlideData, _ev: any) { return { min: 0, max: this.getNativeElement().offsetWidth @@ -29,7 +29,7 @@ export class SlideGesture extends PanGesture { * For example, an open side menu starts at 100% and a closed * sidemenu starts at 0%. */ - getElementStartPos(slide: SlideData, ev: any) { + getElementStartPos(_slide: SlideData, _ev: any) { return 0; } @@ -85,10 +85,10 @@ export class SlideGesture extends PanGesture { this.slide = null; } - onSlideBeforeStart(ev?: any): void {} - onSlideStart(slide?: SlideData, ev?: any): void {} - onSlide(slide?: SlideData, ev?: any): void {} - onSlideEnd(slide?: SlideData, ev?: any): void {} + onSlideBeforeStart(_ev?: any): void {} + onSlideStart(_slide?: SlideData, _ev?: any): void {} + onSlide(_slide?: SlideData, _ev?: any): void {} + onSlideEnd(_slide?: SlideData, _ev?: any): void {} } /** diff --git a/src/gestures/ui-event-manager.ts b/src/gestures/ui-event-manager.ts index a8688d25ea..a39b288e8f 100644 --- a/src/gestures/ui-event-manager.ts +++ b/src/gestures/ui-event-manager.ts @@ -1,5 +1,5 @@ import { PointerEvents, PointerEventsConfig } from './pointer-events'; -import { Platform, EventListenerOptions } from '../platform/platform'; +import { EventListenerOptions, Platform } from '../platform/platform'; /** diff --git a/src/module.ts b/src/module.ts index e080bdb4f1..6ac1054412 100644 --- a/src/module.ts +++ b/src/module.ts @@ -2,7 +2,7 @@ * Import Angular */ import { ANALYZE_FOR_ENTRY_COMPONENTS, APP_INITIALIZER, ComponentFactoryResolver, Inject, Injector, ModuleWithProviders, NgModule, NgZone, Optional } from '@angular/core'; -import { APP_BASE_HREF, Location, LocationStrategy, HashLocationStrategy, PathLocationStrategy, PlatformLocation } from '@angular/common'; +import { APP_BASE_HREF, HashLocationStrategy, Location, LocationStrategy, PathLocationStrategy, PlatformLocation } from '@angular/common'; import { DOCUMENT, HAMMER_GESTURE_CONFIG } from '@angular/platform-browser'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; @@ -18,7 +18,7 @@ import { DeepLinkConfig } from './navigation/nav-util'; import { App } from './components/app/app'; import { AppRootToken } from './components/app/app-root'; -import { Config, setupConfig, ConfigToken } from './config/config'; +import { Config, ConfigToken, setupConfig } from './config/config'; import { DeepLinker, setupDeepLinker } from './navigation/deep-linker'; import { DomController } from './platform/dom-controller'; import { Events, setupProvideEvents } from './util/events'; @@ -27,14 +27,14 @@ import { GestureController } from './gestures/gesture-controller'; import { IonicGestureConfig } from './gestures/gesture-config'; import { Haptic } from './tap-click/haptic'; import { Keyboard } from './platform/keyboard'; -import { ModuleLoader, provideModuleLoader, setupPreloading, LAZY_LOADED_TOKEN } from './util/module-loader'; +import { LAZY_LOADED_TOKEN, ModuleLoader, provideModuleLoader, setupPreloading } from './util/module-loader'; import { NgModuleLoader } from './util/ng-module-loader'; import { Platform, setupPlatform } from './platform/platform'; import { PlatformConfigToken, providePlatformConfigs } from './platform/platform-registry'; import { TapClick, setupTapClick } from './tap-click/tap-click'; import { registerModeConfigs } from './config/mode-registry'; import { TransitionController } from './transitions/transition-controller'; -import { UrlSerializer, setupUrlSerializer, DeepLinkConfigToken } from './navigation/url-serializer'; +import { DeepLinkConfigToken, UrlSerializer, setupUrlSerializer } from './navigation/url-serializer'; /** * Import Components/Directives/Etc diff --git a/src/navigation/deep-linker.ts b/src/navigation/deep-linker.ts index 151c7e4d1e..4fff116f0c 100644 --- a/src/navigation/deep-linker.ts +++ b/src/navigation/deep-linker.ts @@ -2,7 +2,7 @@ import { ComponentFactory, ComponentFactoryResolver } from '@angular/core'; import { Location } from '@angular/common'; import { App } from '../components/app/app'; -import { convertToViews, DIRECTION_BACK, isNav, isTab, isTabs, NavLink, NavSegment } from './nav-util'; +import { DIRECTION_BACK, NavLink, NavSegment, convertToViews, isNav, isTab, isTabs, } from './nav-util'; import { ModuleLoader } from '../util/module-loader'; import { isArray, isPresent } from '../util/util'; import { Tab, Tabs } from './nav-interfaces'; @@ -129,7 +129,7 @@ export class DeepLinker { * Update the deep linker using the NavController's current active view. * @internal */ - navChange(navId: string, direction: string) { + navChange(direction: string) { if (direction) { const rootNavContainers = this._app.getActiveNavContainers(); // the only time you'll ever get a TABS here is when loading directly from a URL @@ -265,7 +265,7 @@ export class DeepLinker { /** * @internal */ - createUrl(navContainer: NavigationContainer, nameOrComponent: any, data: any, prepareExternalUrl: boolean = true): string { + createUrl(navContainer: NavigationContainer, nameOrComponent: any, _data: any, prepareExternalUrl: boolean = true): string { // create a segment out of just the passed in name const segment = this._serializer.createSegmentFromName(navContainer, nameOrComponent); const allSegments = this.getCurrentSegments(); diff --git a/src/navigation/ionic-page.ts b/src/navigation/ionic-page.ts index 4ca7319f48..bc7056da1d 100644 --- a/src/navigation/ionic-page.ts +++ b/src/navigation/ionic-page.ts @@ -263,7 +263,7 @@ export interface IonicPageMetadata { * the application. * */ -export function IonicPage(config?: IonicPageMetadata): ClassDecorator { +export function IonicPage(_config?: IonicPageMetadata): ClassDecorator { return function(clazz: any) { return clazz; }; diff --git a/src/navigation/nav-controller-base.ts b/src/navigation/nav-controller-base.ts index da32eab880..8a8be94b79 100644 --- a/src/navigation/nav-controller-base.ts +++ b/src/navigation/nav-controller-base.ts @@ -1,16 +1,39 @@ -import { ComponentRef, Input, ComponentFactoryResolver, ElementRef, ErrorHandler, EventEmitter, NgZone, ReflectiveInjector, Renderer, ViewContainerRef } from '@angular/core'; +import { + ComponentFactoryResolver, + ComponentRef, + ElementRef, + ErrorHandler, + EventEmitter, + Input, + NgZone, + ReflectiveInjector, + Renderer, + ViewContainerRef +} from '@angular/core'; import { AnimationOptions } from '../animations/animation'; import { App } from '../components/app/app'; import { Config } from '../config/config'; -import { convertToViews, NavOptions, NavResult, DIRECTION_BACK, DIRECTION_FORWARD, INIT_ZINDEX, - TransitionInstruction, STATE_NEW, STATE_INITIALIZED, STATE_ATTACHED, STATE_DESTROYED } from './nav-util'; +import { + DIRECTION_BACK, + DIRECTION_FORWARD, + INIT_ZINDEX, + NavOptions, + NavResult, + STATE_ATTACHED, + STATE_DESTROYED, + STATE_INITIALIZED, + STATE_NEW, + TransitionInstruction, + convertToViews, +} from './nav-util'; + import { setZIndex } from './nav-util'; import { DeepLinker } from './deep-linker'; import { DomController } from '../platform/dom-controller'; import { GestureController } from '../gestures/gesture-controller'; -import { isBlank, isNumber, isPresent, isTrueProperty, assert } from '../util/util'; -import { isViewController, ViewController } from './view-controller'; +import { assert, isBlank, isNumber, isPresent, isTrueProperty } from '../util/util'; +import { ViewController, isViewController } from './view-controller'; import { Ion } from '../components/ion'; import { NavigationContainer } from './navigation-container'; import { NavController } from './nav-controller'; @@ -758,7 +781,7 @@ export class NavControllerBase extends Ion implements NavController { if (!this.hasChildren() && opts.updateUrl !== false) { // notify deep linker of the nav change // if a direction was provided and should update url - this._linker.navChange(this.id, opts.direction); + this._linker.navChange(opts.direction); } if (opts.keyboardClose !== false) { @@ -1151,7 +1174,7 @@ export class NavControllerBase extends Ion implements NavController { content && content.resize(); } - goToRoot(opts: NavOptions) { + goToRoot(_opts: NavOptions) { return Promise.reject(new Error('goToRoot needs to be implemented by child class')); } diff --git a/src/navigation/nav-controller.ts b/src/navigation/nav-controller.ts index a830fe8df4..b6db46d7f1 100644 --- a/src/navigation/nav-controller.ts +++ b/src/navigation/nav-controller.ts @@ -598,7 +598,7 @@ export abstract class NavController implements NavigationContainer { * Returns if the nav controller is actively transitioning or not. * @return {boolean} */ - abstract isTransitioning(includeAncestors?: boolean): boolean + abstract isTransitioning(includeAncestors?: boolean): boolean; /** * If it's possible to use swipe back or not. If it's not possible diff --git a/src/navigation/nav-util.ts b/src/navigation/nav-util.ts index 9ad92021f1..772978a5fa 100644 --- a/src/navigation/nav-util.ts +++ b/src/navigation/nav-util.ts @@ -2,7 +2,7 @@ import { Renderer, TypeDecorator } from '@angular/core'; import { DeepLinker } from './deep-linker'; import { IonicPageMetadata } from './ionic-page'; import { isArray, isPresent } from '../util/util'; -import { isViewController, ViewController } from './view-controller'; +import { ViewController, isViewController } from './view-controller'; import { NavControllerBase } from './nav-controller-base'; import { Transition } from '../transitions/transition'; diff --git a/src/navigation/overlay-proxy.ts b/src/navigation/overlay-proxy.ts index ac992a5ee9..c84c014d1e 100644 --- a/src/navigation/overlay-proxy.ts +++ b/src/navigation/overlay-proxy.ts @@ -44,7 +44,7 @@ export class OverlayProxy { dismiss(data?: any, role?: string, navOptions?: NavOptions): Promise { if (this.overlay) { - return this.overlay.dismiss(); + return this.overlay.dismiss(data, role, navOptions); } } diff --git a/src/navigation/swipe-back.ts b/src/navigation/swipe-back.ts index b4f09cb37c..ba730084de 100644 --- a/src/navigation/swipe-back.ts +++ b/src/navigation/swipe-back.ts @@ -1,6 +1,6 @@ import { swipeShouldReset } from '../util/util'; import { DomController } from '../platform/dom-controller'; -import { GestureController, GESTURE_PRIORITY_GO_BACK_SWIPE, GESTURE_GO_BACK_SWIPE } from '../gestures/gesture-controller'; +import { GESTURE_GO_BACK_SWIPE, GESTURE_PRIORITY_GO_BACK_SWIPE, GestureController } from '../gestures/gesture-controller'; import { NavControllerBase } from './nav-controller-base'; import { Platform } from '../platform/platform'; import { SlideData } from '../gestures/slide-gesture'; @@ -42,7 +42,7 @@ export class SwipeBackGesture extends SlideEdgeGesture { ); } - onSlideBeforeStart(ev: any) { + onSlideBeforeStart(_ev: any) { this._nav.swipeBackStart(); } @@ -54,7 +54,7 @@ export class SwipeBackGesture extends SlideEdgeGesture { this._nav.swipeBackProgress(stepValue); } - onSlideEnd(slide: SlideData, ev: any) { + onSlideEnd(slide: SlideData, _ev: any) { const velocity = slide.velocity; const currentStepValue = (slide.distance / slide.max); const isResetDirecction = velocity < 0; diff --git a/src/navigation/test/deep-linker.spec.ts b/src/navigation/test/deep-linker.spec.ts index 6560b33d2a..ea7b50736a 100644 --- a/src/navigation/test/deep-linker.spec.ts +++ b/src/navigation/test/deep-linker.spec.ts @@ -1,9 +1,20 @@ import * as deepLinker from '../deep-linker'; import { NavSegment } from '../nav-util'; import { UrlSerializer } from '../url-serializer'; -import { mockApp, mockDeepLinkConfig, mockNavController, mockLocation, - mockModuleLoader, mockTab, mockTabs, mockViews, mockView, noop, - MockView1, MockView2 } from '../../util/mock-providers'; +import { + MockView1, + MockView2, + mockApp, + mockDeepLinkConfig, + mockLocation, + mockModuleLoader, + mockNavController, + mockTab, + mockTabs, + mockView, + mockViews, + noop +} from '../../util/mock-providers'; describe('DeepLinker', () => { @@ -415,7 +426,7 @@ describe('DeepLinker', () => { spyOn(linker, 'getSegmentsFromNav'); - linker.navChange('1', 'forward'); + linker.navChange('forward'); expect(linker.getSegmentsFromNav).not.toHaveBeenCalled(); }); @@ -429,7 +440,7 @@ describe('DeepLinker', () => { spyOn(linker, 'getSegmentsFromNav'); - linker.navChange('1', 'forward'); + linker.navChange('forward'); expect(linker.getSegmentsFromNav).not.toHaveBeenCalled(); }); diff --git a/src/navigation/test/nav-controller.spec.ts b/src/navigation/test/nav-controller.spec.ts index c990dc21c5..f69f25729d 100644 --- a/src/navigation/test/nav-controller.spec.ts +++ b/src/navigation/test/nav-controller.spec.ts @@ -1,7 +1,15 @@ -import { mockNavController, mockView, mockViews, - MockView1, MockView2, MockView3, MockView4, MockView5 } from '../../util/mock-providers'; +import { + MockView1, + MockView2, + MockView3, + MockView4, + MockView5, + mockNavController, + mockView, + mockViews +} from '../../util/mock-providers'; import { NavControllerBase } from '../nav-controller-base'; -import { NavOptions, DIRECTION_FORWARD, DIRECTION_BACK } from '../nav-util'; +import { DIRECTION_BACK, DIRECTION_FORWARD, NavOptions, } from '../nav-util'; import { ViewController } from '../view-controller'; diff --git a/src/navigation/test/nav-util.spec.ts b/src/navigation/test/nav-util.spec.ts index 0f2bd71c81..fe353e7d77 100644 --- a/src/navigation/test/nav-util.spec.ts +++ b/src/navigation/test/nav-util.spec.ts @@ -1,5 +1,5 @@ -import { convertToView, convertToViews, DIRECTION_BACK, DIRECTION_FORWARD, setZIndex } from '../nav-util'; -import { mockDeepLinker, mockNavController, MockView, mockRenderer, mockView, mockViews } from '../../util/mock-providers'; +import { DIRECTION_BACK, DIRECTION_FORWARD, convertToView, convertToViews, setZIndex } from '../nav-util'; +import { MockView, mockDeepLinker, mockNavController, mockRenderer, mockView, mockViews } from '../../util/mock-providers'; import { ViewController } from '../view-controller'; diff --git a/src/navigation/test/url-serializer.spec.ts b/src/navigation/test/url-serializer.spec.ts index 204be048a9..ed3000a73b 100644 --- a/src/navigation/test/url-serializer.spec.ts +++ b/src/navigation/test/url-serializer.spec.ts @@ -1,17 +1,17 @@ import { NavLink, NavSegment } from '../nav-util'; import { + NavGroup, + UrlSerializer, createMatchedData, findLinkByComponentData, formatUrlPart, isPartMatch, - NavGroup, navGroupStringtoObjects, normalizeLinks, parseUrlParts, - UrlSerializer, urlToNavGroupStrings, } from '../url-serializer'; -import { mockNavController, mockDeepLinkConfig, noop, MockView1, MockView2, MockView3 } from '../../util/mock-providers'; +import { MockView1, MockView2, MockView3, mockDeepLinkConfig, mockNavController, noop } from '../../util/mock-providers'; describe('UrlSerializer', () => { diff --git a/src/navigation/test/view-controller.spec.ts b/src/navigation/test/view-controller.spec.ts index 3cf991666d..a8cb114a9a 100644 --- a/src/navigation/test/view-controller.spec.ts +++ b/src/navigation/test/view-controller.spec.ts @@ -4,7 +4,7 @@ import { STATE_ATTACHED } from '../nav-util'; describe('ViewController', () => { describe('willEnter', () => { - it('should emit LifeCycleEvent when called with component data', (done) => { + it('should emit LifeCycleEvent when called with component data', (done: Function) => { // arrange let viewController = mockView(); subscription = viewController.willEnter.subscribe((event: any) => { @@ -12,7 +12,7 @@ describe('ViewController', () => { expect(event).toEqual(null); done(); }, (err: any) => { - done(); + done(err); }); // act @@ -22,7 +22,7 @@ describe('ViewController', () => { }); describe('didEnter', () => { - it('should emit LifeCycleEvent when called with component data', (done) => { + it('should emit LifeCycleEvent when called with component data', (done: Function) => { // arrange let viewController = mockView(); subscription = viewController.didEnter.subscribe((event: any) => { @@ -30,7 +30,7 @@ describe('ViewController', () => { expect(event).toEqual(null); done(); }, (err: any) => { - done(); + done(err); }); // act @@ -40,7 +40,7 @@ describe('ViewController', () => { }); describe('willLeave', () => { - it('should emit LifeCycleEvent when called with component data', (done) => { + it('should emit LifeCycleEvent when called with component data', (done: Function) => { // arrange let viewController = mockView(); subscription = viewController.willLeave.subscribe((event: any) => { @@ -48,7 +48,7 @@ describe('ViewController', () => { expect(event).toEqual(null); done(); }, (err: any) => { - done(); + done(err); }); // act @@ -58,7 +58,7 @@ describe('ViewController', () => { }); describe('didLeave', () => { - it('should emit LifeCycleEvent when called with component data', (done) => { + it('should emit LifeCycleEvent when called with component data', (done: Function) => { // arrange let viewController = mockView(); subscription = viewController.didLeave.subscribe((event: any) => { @@ -66,7 +66,7 @@ describe('ViewController', () => { expect(event).toEqual(null); done(); }, (err: any) => { - done(); + done(err); }); // act @@ -75,14 +75,14 @@ describe('ViewController', () => { }); describe('willUnload', () => { - it('should emit LifeCycleEvent when called with component data', (done) => { + it('should emit LifeCycleEvent when called with component data', (done: Function) => { // arrange let viewController = mockView(); subscription = viewController.willUnload.subscribe((event: any) => { expect(event).toEqual(null); done(); }, (err: any) => { - done(); + done(err); }); // act diff --git a/src/navigation/view-controller.ts b/src/navigation/view-controller.ts index e4ac613cd6..70cabfa4c8 100644 --- a/src/navigation/view-controller.ts +++ b/src/navigation/view-controller.ts @@ -1,8 +1,8 @@ import { ComponentRef, ElementRef, EventEmitter, Output, Renderer } from '@angular/core'; -import { isPresent, assert } from '../util/util'; +import { assert, isPresent } from '../util/util'; import { NavController } from './nav-controller'; -import { NavOptions, STATE_NEW, STATE_INITIALIZED, STATE_ATTACHED, STATE_DESTROYED } from './nav-util'; +import { NavOptions, STATE_ATTACHED, STATE_DESTROYED, STATE_INITIALIZED, STATE_NEW } from './nav-util'; import { NavParams } from './nav-params'; import { Content, Footer, Header, Navbar } from './nav-interfaces'; @@ -197,7 +197,7 @@ export class ViewController { /** * @hidden */ - getTransitionName(direction: string): string { + getTransitionName(_direction: string): string { return this._nav && this._nav.config.get('pageTransition'); } diff --git a/src/platform/dom-controller.ts b/src/platform/dom-controller.ts index 8d5675ce27..32daa83d0d 100644 --- a/src/platform/dom-controller.ts +++ b/src/platform/dom-controller.ts @@ -28,7 +28,7 @@ export class DomDebouncer { }); } - write(fn: DomCallback, ctx?: any): Function { + write(fn: DomCallback): Function { if (this.writeTask) { return; } diff --git a/src/platform/keyboard.ts b/src/platform/keyboard.ts index cabfde6d9b..edd0dc3929 100644 --- a/src/platform/keyboard.ts +++ b/src/platform/keyboard.ts @@ -1,4 +1,4 @@ -import { Injectable, NgZone, EventEmitter } from '@angular/core'; +import { EventEmitter, Injectable, NgZone } from '@angular/core'; import { Config } from '../config/config'; import { DomController } from './dom-controller'; diff --git a/src/tap-click/activator.ts b/src/tap-click/activator.ts index 9e87505296..fed984c9a1 100644 --- a/src/tap-click/activator.ts +++ b/src/tap-click/activator.ts @@ -20,7 +20,7 @@ export class Activator implements ActivatorBase { this._css = config.get('activatedClass', 'activated'); } - clickAction(ev: UIEvent, activatableEle: HTMLElement, startCoord: PointerCoordinates) { + clickAction(ev: UIEvent, activatableEle: HTMLElement, _startCoord: PointerCoordinates) { if (isActivatedDisabled(ev, activatableEle)) { return; } @@ -41,7 +41,7 @@ export class Activator implements ActivatorBase { } } - downAction(ev: UIEvent, activatableEle: HTMLElement, startCoord: PointerCoordinates) { + downAction(ev: UIEvent, activatableEle: HTMLElement, _startCoord: PointerCoordinates) { // the user just pressed down if (isActivatedDisabled(ev, activatableEle)) { return; @@ -66,7 +66,7 @@ export class Activator implements ActivatorBase { } // the user was pressing down, then just let up - upAction(ev: UIEvent, activatableEle: HTMLElement, startCoord: PointerCoordinates) { + upAction(_ev: UIEvent, _activatableEle: HTMLElement, _startCoord: PointerCoordinates) { this._scheduleClear(); } diff --git a/src/tap-click/ripple.ts b/src/tap-click/ripple.ts index 8ca85ccd81..1c2a3979ed 100644 --- a/src/tap-click/ripple.ts +++ b/src/tap-click/ripple.ts @@ -45,7 +45,7 @@ export class RippleActivator implements ActivatorBase { this.highlight && this.highlight.clearState(animated); } - _downAction(ev: UIEvent, activatableEle: HTMLElement, startCoord: PointerCoordinates) { + _downAction(ev: UIEvent, activatableEle: HTMLElement, _startCoord: PointerCoordinates) { if (isActivatedDisabled(ev, activatableEle)) { return; } @@ -79,7 +79,7 @@ export class RippleActivator implements ActivatorBase { } } - _clickAction(ev: UIEvent, activatableEle: HTMLElement, startCoord: PointerCoordinates) { + _clickAction(_ev: UIEvent, _activatableEle: HTMLElement, _startCoord: PointerCoordinates) { // NOTHING } diff --git a/src/tap-click/tap-click.ts b/src/tap-click/tap-click.ts index cd9875a9f3..c42b7c1e3b 100644 --- a/src/tap-click/tap-click.ts +++ b/src/tap-click/tap-click.ts @@ -8,8 +8,8 @@ import { Config } from '../config/config'; import { DomController } from '../platform/dom-controller'; import { GestureController } from '../gestures/gesture-controller'; import { Platform } from '../platform/platform'; -import { pointerCoord, hasPointerMoved } from '../util/dom'; -import { PointerEvents, POINTER_EVENT_TYPE_TOUCH } from '../gestures/pointer-events'; +import { hasPointerMoved, pointerCoord } from '../util/dom'; +import { POINTER_EVENT_TYPE_TOUCH, PointerEvents } from '../gestures/pointer-events'; import { RippleActivator } from './ripple'; import { UIEventManager } from '../gestures/ui-event-manager'; @@ -247,7 +247,7 @@ export function isActivatable(ele: HTMLElement) { } } return false; -}; +} const ACTIVATABLE_ELEMENTS = ['A', 'BUTTON']; const ACTIVATABLE_ATTRIBUTES = ['tappable', 'ion-button']; diff --git a/src/tap-click/test/activator.spec.ts b/src/tap-click/test/activator.spec.ts index 43709e7f60..89d67f7f6e 100644 --- a/src/tap-click/test/activator.spec.ts +++ b/src/tap-click/test/activator.spec.ts @@ -1,6 +1,6 @@ import { Activator } from '../activator'; import { Config } from '../../config/config'; -import { mockDomController, MockDomController } from '../../util/mock-providers'; +import { MockDomController, mockDomController } from '../../util/mock-providers'; describe('Activator', () => { diff --git a/src/util/base-input.ts b/src/util/base-input.ts index 1094915a79..45f57c465d 100644 --- a/src/util/base-input.ts +++ b/src/util/base-input.ts @@ -2,7 +2,7 @@ import { AfterContentInit, ElementRef, EventEmitter, Input, NgZone, Output, Rend import { ControlValueAccessor } from '@angular/forms'; import { NgControl } from '@angular/forms'; -import { isPresent, isString, isUndefined, isArray, isTrueProperty, deepCopy, assert } from './util'; +import { assert, deepCopy, isArray, isPresent, isString, isTrueProperty, isUndefined } from './util'; import { IonicFormInput } from './form'; import { Ion } from '../components/ion'; import { Config } from '../config/config'; diff --git a/src/util/datetime-util.ts b/src/util/datetime-util.ts index 510bbf9643..2d0466db85 100644 --- a/src/util/datetime-util.ts +++ b/src/util/datetime-util.ts @@ -10,8 +10,8 @@ export function renderDateTime(template: string, value: DateTimeData, locale: Lo let hasText = false; FORMAT_KEYS.forEach((format, index) => { if (template.indexOf(format.f) > -1) { - var token = '{' + index + '}'; - var text = renderTextFormat(format.f, (value)[format.k], value, locale); + const token = '{' + index + '}'; + const text = renderTextFormat(format.f, (value)[format.k], value, locale); if (!hasText && text && isPresent((value)[format.k])) { hasText = true; @@ -27,7 +27,7 @@ export function renderDateTime(template: string, value: DateTimeData, locale: Lo return ''; } - for (var i = 0; i < tokens.length; i += 2) { + for (let i = 0; i < tokens.length; i += 2) { template = template.replace(tokens[i], tokens[i + 1]); } @@ -198,11 +198,11 @@ export function parseDate(val: any): DateTimeData { } // ensure all the parse values exist with at least 0 - for (var i = 1; i < 8; i++) { + for (let i = 1; i < 8; i++) { parse[i] = (parse[i] !== undefined ? parseInt(parse[i], 10) : null); } - var tzOffset = 0; + let tzOffset = 0; if (isPresent(parse[9]) && isPresent(parse[10])) { // hours tzOffset = parseInt(parse[10], 10) * 60; @@ -258,7 +258,7 @@ export function updateDate(existingData: DateTimeData, newData: any): boolean { // merge new values from the picker's selection // to the existing DateTimeData values - for (var k in newData) { + for (const k in newData) { (existingData)[k] = newData[k].value; } @@ -270,7 +270,7 @@ export function updateDate(existingData: DateTimeData, newData: any): boolean { } else { // blank data, clear everything out - for (var k in existingData) { + for (const k in existingData) { delete (existingData)[k]; } } @@ -324,7 +324,7 @@ export function getValueFromFormat(date: DateTimeData, format: string) { export function convertFormatToKey(format: string): string { - for (var k in FORMAT_KEYS) { + for (const k in FORMAT_KEYS) { if (FORMAT_KEYS[k].f === format) { return FORMAT_KEYS[k].k; } diff --git a/src/util/mock-providers.ts b/src/util/mock-providers.ts index e51cefe05f..8e56f3dcf4 100644 --- a/src/util/mock-providers.ts +++ b/src/util/mock-providers.ts @@ -30,7 +30,7 @@ import { Item } from '../components/item/item'; import { Form } from './form'; -export function mockConfig(config?: any, url: string = '/', platform?: Platform) { +export function mockConfig(config?: any, _url: string = '/', platform?: Platform) { const c = new Config(); const p = platform || mockPlatform(); c.init(config, p); @@ -286,9 +286,9 @@ export class MockElement { this.attributes[name] = val; } - addEventListener(type: string, listener: Function, options?: any) { } + addEventListener(_type: string, _listener: Function, _options?: any) { } - removeEventListener(type: string, listener: Function, options?: any) { } + removeEventListener(_type: string, _listener: Function, _options?: any) { } removeAttribute(name: string) { delete this.attributes[name]; @@ -432,7 +432,7 @@ export function mockNavController(): NavControllerBase { (nav)._orgViewInsert = nav._viewAttachToDOM; - nav._viewAttachToDOM = function(view: ViewController, componentRef: ComponentRef, viewport: ViewContainerRef) { + nav._viewAttachToDOM = function(view: ViewController, componentRef: ComponentRef, _viewport: ViewContainerRef) { let mockedViewport: any = { insert: () => { } }; @@ -501,7 +501,7 @@ export function mockTab(parentTabs: Tabs, overrideLoad: boolean = true): Tab { ); if (overrideLoad) { - tab.load = (opts: any, cb: Function) => { + tab.load = (_opts: any, cb: Function) => { cb(); }; } @@ -573,7 +573,7 @@ export class MockView3 {} export class MockView4 {} export class MockView5 {} -export function noop(): any { return 'noop'; }; +export function noop(): any { return 'noop'; } export function mockModuleLoader(ngModuleLoader?: NgModuleLoader): ModuleLoader { ngModuleLoader = ngModuleLoader || mockNgModuleLoader(); @@ -586,9 +586,9 @@ export function mockNgModuleLoader(): NgModuleLoader { export function mockOverlay() { return { - present: (opts?: NavOptions) => { return Promise.resolve(); }, - dismiss: (data?: any, role?: string, navOptions?: NavOptions) => { return Promise.resolve(); }, - onDidDismiss: (callback: Function) => { }, - onWillDismiss: (callback: Function) => { } + present: (_opts?: NavOptions) => { return Promise.resolve(); }, + dismiss: (_data?: any, _role?: string, _navOptions?: NavOptions) => { return Promise.resolve(); }, + onDidDismiss: (_callback: Function) => { }, + onWillDismiss: (_callback: Function) => { } }; } diff --git a/src/util/module-loader.ts b/src/util/module-loader.ts index fcd918cde4..afd4594999 100644 --- a/src/util/module-loader.ts +++ b/src/util/module-loader.ts @@ -68,7 +68,7 @@ export function provideModuleLoader(ngModuleLoader: NgModuleLoader, injector: In export interface LoadedModule { componentFactoryResolver: ComponentFactoryResolver; component: Type; -}; +} /** diff --git a/src/util/scroll-view.ts b/src/util/scroll-view.ts index eb3d3cc48a..985cd02f14 100644 --- a/src/util/scroll-view.ts +++ b/src/util/scroll-view.ts @@ -1,8 +1,8 @@ import { assert } from './util'; import { App } from '../components/app/app'; -import { DomController, DomCallback } from '../platform/dom-controller'; -import { Platform, EventListenerOptions } from '../platform/platform'; +import { DomCallback, DomController } from '../platform/dom-controller'; +import { EventListenerOptions, Platform } from '../platform/platform'; import { pointerCoord } from './dom'; @@ -181,7 +181,7 @@ export class ScrollView { // debounce for a moment after the last scroll event self._dom.cancel(self._endTmr); self._endTmr = self._dom.read(scrollEnd, SCROLL_END_DEBOUNCE_MS); - }; + } // clear out any existing listeners (just to be safe) self._lsn && self._lsn(); @@ -225,7 +225,7 @@ export class ScrollView { // ******** DOM READ **************** max = ele.scrollHeight - ele.parentElement.offsetHeight + contentTop + contentBottom; } - }; + } function jsScrollDecelerate(timeStamp: number) { ev.timeStamp = timeStamp; diff --git a/src/util/test/base-input.spec.ts b/src/util/test/base-input.spec.ts index 5f6e83c6f7..9470257a4b 100644 --- a/src/util/test/base-input.spec.ts +++ b/src/util/test/base-input.spec.ts @@ -2,8 +2,8 @@ import { BaseInput } from '../base-input'; import { Form } from '../form'; import { Item } from '../../components/item/item'; -import { commonInputTest, ANY_CORPUS } from '../input-tester'; -import { mockConfig, mockPlatform, mockElementRef, mockRenderer, mockForm } from '../mock-providers'; +import { ANY_CORPUS, commonInputTest } from '../input-tester'; +import { mockConfig, mockElementRef, mockForm, mockPlatform, mockRenderer } from '../mock-providers'; let platform: any; let config: any; diff --git a/src/util/test/mock-providers.spec.ts b/src/util/test/mock-providers.spec.ts index 9661ef4e7a..30af703bcd 100644 --- a/src/util/test/mock-providers.spec.ts +++ b/src/util/test/mock-providers.spec.ts @@ -1,6 +1,5 @@ -import { mockPlatform, MockPlatform } from '../mock-providers'; -import { mockDomController, MockDomController } from '../mock-providers'; - +import { MockPlatform, mockPlatform } from '../mock-providers'; +import { MockDomController, mockDomController } from '../mock-providers'; describe('mock-providers', () => { diff --git a/src/util/test/module-loader.spec.ts b/src/util/test/module-loader.spec.ts index a8d8aba897..c7dbb4ae8c 100644 --- a/src/util/test/module-loader.spec.ts +++ b/src/util/test/module-loader.spec.ts @@ -1,5 +1,5 @@ -import { ModuleLoader, LAZY_LOADED_TOKEN, setupPreloadingImplementation } from '../module-loader'; -import { mockModuleLoader, mockNgModuleLoader, mockConfig } from '../mock-providers'; +import { LAZY_LOADED_TOKEN, ModuleLoader, setupPreloadingImplementation } from '../module-loader'; +import { mockConfig, mockModuleLoader, mockNgModuleLoader } from '../mock-providers'; import { NgModuleLoader } from '../ng-module-loader'; import { Config } from '../../config/config'; import { DeepLinkConfig } from '../../navigation/nav-util'; @@ -121,7 +121,7 @@ describe('module-loader', () => { it('should return a promise', (done: Function) => { let promise = setupPreloadingImplementation(config, null, moduleLoader); - promise.then((response) => { + promise.then(() => { done(); }).catch((err: Error) => { fail(err); @@ -137,7 +137,7 @@ describe('module-loader', () => { links: [] }; let promise = setupPreloadingImplementation(config, deepLinkConfig, moduleLoader); - promise.then((response) => { + promise.then(() => { expect(moduleLoader.load).not.toHaveBeenCalled(); done(); }).catch((err: Error) => { @@ -151,7 +151,7 @@ describe('module-loader', () => { config.set('preloadModules', true); let promise = setupPreloadingImplementation(config, null, moduleLoader); - promise.then((response) => { + promise.then(() => { expect(moduleLoader.load).not.toHaveBeenCalled(); done(); }).catch((err: Error) => { @@ -171,7 +171,7 @@ describe('module-loader', () => { }] }; let promise = setupPreloadingImplementation(config, deepLinkConfig, moduleLoader); - promise.then((response) => { + promise.then(() => { expect(moduleLoader.load).not.toHaveBeenCalled(); done(); }).catch((err: Error) => { @@ -191,7 +191,7 @@ describe('module-loader', () => { }] }; let promise = setupPreloadingImplementation(config, deepLinkConfig, moduleLoader); - promise.then((response) => { + promise.then(() => { expect(moduleLoader.load).toHaveBeenCalledWith('lowString'); done(); }).catch((err: Error) => { @@ -211,7 +211,7 @@ describe('module-loader', () => { }] }; let promise = setupPreloadingImplementation(config, deepLinkConfig, moduleLoader); - promise.then((response) => { + promise.then(() => { expect(moduleLoader.load).toHaveBeenCalledWith('highString'); done(); }).catch((err: Error) => { diff --git a/src/util/util.ts b/src/util/util.ts index a8d3b46bb2..ad6bbe7256 100644 --- a/src/util/util.ts +++ b/src/util/util.ts @@ -67,7 +67,7 @@ export function normalizeURL(url: string): string { * the first object. * @param {any} dest the destination to apply defaults to. */ -export function defaults(dest: any, ...args: any[]) { +export function defaults(dest: any, ..._args: any[]) { for (var i = arguments.length - 1; i >= 1; i--) { var source = arguments[i]; if (source) { @@ -101,14 +101,14 @@ export function isBlank(val: any): val is null { return val === undefined || val /** @hidden */ export function isObject(val: any): val is Object { return typeof val === 'object'; } /** @hidden */ -export function isArray(val: any): val is any[] { return Array.isArray(val); }; +export function isArray(val: any): val is any[] { return Array.isArray(val); } /** @hidden */ export function isPrimitive(val: any) { return isString(val) || isBoolean(val) || (isNumber(val) && !isNaN(val)); -}; +} /** @hidden */ @@ -118,7 +118,7 @@ export function isTrueProperty(val: any): boolean { return (val === 'true' || val === 'on' || val === ''); } return !!val; -}; +} /** @hidden */ @@ -138,7 +138,7 @@ export function isCheckedProperty(a: any, b: any): boolean { // not using strict comparison on purpose return (a == b); // tslint:disable-line -}; +} /** @hidden */ export type Side = 'left' | 'right' | 'start' | 'end'; diff --git a/tsconfig.json b/tsconfig.json index ea090f02e6..8ac92f6a39 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,6 +8,8 @@ "module": "commonjs", "moduleResolution": "node", "noImplicitAny": true, + "noUnusedLocals": true, + "noUnusedParameters": true, "outDir": "dist/tmp", "removeComments": false, "sourceMap": true,