Merge pull request #99 from zvonimirfras/master

zvonimirfras · web-flow · commit 2636aedd12b7 · 2018-09-20T14:04:38.000-04:00
chore: improve lint rules; remove unused imports
diff --git a/src/button-menu/button-menu-item.component.spec.ts b/src/button-menu/button-menu-item.component.spec.ts
@@ -35,7 +35,7 @@ describe("Button Menu", () => {
 						provide: TranslateLoader, useClass: TranslateFakeLoader
 					}
 				})
-			],
+			]
 		});
 	});
 
diff --git a/src/checkbox/checkbox.module.ts b/src/checkbox/checkbox.module.ts
@@ -11,10 +11,10 @@ export { CheckboxComponent } from "./checkbox.component";
 
 @NgModule({
 	declarations: [
-		CheckboxComponent,
+		CheckboxComponent
 	],
 	exports: [
-		CheckboxComponent,
+		CheckboxComponent
 	],
 	imports: [
 		CommonModule,
diff --git a/src/combobox/combobox.module.ts b/src/combobox/combobox.module.ts
@@ -12,7 +12,7 @@ export { ComboBox } from "./combobox.component";
 
 @NgModule({
 	declarations: [
-		ComboBox,
+		ComboBox
 	],
 	exports: [
 		ComboBox,
diff --git a/src/content-switcher/content-switcher.component.ts b/src/content-switcher/content-switcher.component.ts
@@ -22,7 +22,7 @@ import { ContentSwitcherOption } from "./content-switcher-option.directive";
 			role="tablist">
 			<ng-content></ng-content>
 		</div>
-	`,
+	`
 })
 export class ContentSwitcher implements AfterViewInit {
 	@Input() label = "content switcher";
diff --git a/src/content-switcher/content-switcher.stories.ts b/src/content-switcher/content-switcher.stories.ts
@@ -1,7 +1,6 @@
 import { storiesOf, moduleMetadata } from "@storybook/angular";
-import { withNotes } from "@storybook/addon-notes";
 import { action } from "@storybook/addon-actions";
-import { withKnobs, boolean, object } from "@storybook/addon-knobs/angular";
+import { withKnobs } from "@storybook/addon-knobs/angular";
 
 import { ContentSwitcherModule } from "../";
 
@@ -10,7 +9,7 @@ storiesOf("Content Switcher", module)
 	.addDecorator(
 		moduleMetadata({
 			imports: [
-				ContentSwitcherModule,
+				ContentSwitcherModule
 			]
 		})
 	)
diff --git a/src/dialog/dialog.component.ts b/src/dialog/dialog.component.ts
@@ -8,7 +8,7 @@ import {
 	OnInit,
 	AfterViewInit,
 	OnDestroy,
-	HostListener,
+	HostListener
 } from "@angular/core";
 import {
 	Observable,
@@ -17,7 +17,7 @@ import {
 	merge
 } from "rxjs";
 import { throttleTime } from "rxjs/operators";
-import position, { AbsolutePosition } from "../utils/position";
+import position from "../utils/position";
 import { cycleTabs } from "./../common/tab.service";
 import { DialogConfig } from "./dialog-config.interface";
 
@@ -103,7 +103,7 @@ export class Dialog implements OnInit, AfterViewInit, OnDestroy {
 		"top": pos => position.addOffset(pos, -this.dialogConfig.gap),
 		"bottom": pos => position.addOffset(pos, this.dialogConfig.gap),
 		"left-bottom": pos => position.addOffset(pos, 0, -this.dialogConfig.gap),
-		"right-bottom": pos => position.addOffset(pos, 0, this.dialogConfig.gap),
+		"right-bottom": pos => position.addOffset(pos, 0, this.dialogConfig.gap)
 	};
 
 	/**
diff --git a/src/dialog/dialog.service.ts b/src/dialog/dialog.service.ts
@@ -5,7 +5,7 @@ import {
 	ComponentFactory,
 	ComponentFactoryResolver,
 	Injectable,
-	ViewContainerRef,
+	ViewContainerRef
 } from "@angular/core";
 import { Subscription } from "rxjs";
 import { DialogConfig } from "./dialog-config.interface";
diff --git a/src/dropdown/dropdown.stories.ts b/src/dropdown/dropdown.stories.ts
@@ -14,7 +14,7 @@ storiesOf("Dropdown", module)
 			imports: [
 				DropdownModule,
 				BootstrapModule
-			],
+			]
 		})
 	)
 	.addDecorator(withKnobs)
diff --git a/src/dropdown/scrollable-list.directive.ts b/src/dropdown/scrollable-list.directive.ts
@@ -1,8 +1,6 @@
 import {
 	Input,
-	Output,
 	Directive,
-	EventEmitter,
 	ElementRef,
 	HostListener,
 	OnChanges,
@@ -12,7 +10,7 @@ import {
 
 @Directive({
 	selector: "[ibmScrollableList]",
-	exportAs: "scrollable-list",
+	exportAs: "scrollable-list"
 })
 export class ScrollableList implements OnChanges, AfterViewInit {
 	/**
diff --git a/src/icon/static-icon.component.ts b/src/icon/static-icon.component.ts
@@ -2,7 +2,7 @@ import {
 	Component,
 	ElementRef,
 	AfterViewInit,
-	Input,
+	Input
 } from "@angular/core";
 
 /**
diff --git a/src/input/input.module.ts b/src/input/input.module.ts
@@ -18,7 +18,7 @@ import { TextInput } from "./input.directive";
 	],
 	imports: [
 		CommonModule,
-		FormsModule,
+		FormsModule
 	]
 })
 class InputModule { }
diff --git a/src/list-group/list-group.component.ts b/src/list-group/list-group.component.ts
@@ -3,7 +3,6 @@ import {
 	Input,
 	Output,
 	EventEmitter,
-	forwardRef,
 	TemplateRef
 } from "@angular/core";
 
@@ -49,7 +48,7 @@ import { findNextElem, findPrevElem } from "../utils/a11y";
 				</ng-template>
 				</li>
 		</ul>
-		`,
+		`
 })
 export class ListGroup {
 	/**
diff --git a/src/modal/modal.component.spec.ts b/src/modal/modal.component.spec.ts
@@ -1,5 +1,5 @@
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
-import { ComponentFixture, TestBed, fakeAsync, tick, async } from "@angular/core/testing";
+import { ComponentFixture, TestBed, async } from "@angular/core/testing";
 import { TranslateModule, TranslateLoader, TranslateFakeLoader } from "@ngx-translate/core";
 import { By } from "@angular/platform-browser";
 import { DebugElement } from "@angular/core";
@@ -17,7 +17,7 @@ Object.defineProperty(document.body.style, "transform", {
 			enumerable: true,
 			configurable: true
 		};
-	},
+	}
 });
 
 describe("ModalComponent", () => {
diff --git a/src/modal/modal.component.ts b/src/modal/modal.component.ts
@@ -102,7 +102,7 @@ import { cycleTabs } from "./../common/tab.service";
 		trigger("modalState", [
 			state("void", style({transform: "translate(0, 5%)", opacity: 0})),
 			transition(":enter", [
-				animate("200ms ease-in"),
+				animate("200ms ease-in")
 			]),
 			transition(":leave", [
 				animate(200, style({transform: "translate(0, 5%)", opacity: 0}))
diff --git a/src/sample/sample.component.spec.ts b/src/sample/sample.component.spec.ts
@@ -23,7 +23,7 @@ describe("Sample", () => {
 			declarations: [
 				Sample,
 				SampleTestComponent
-			],
+			]
 		});
 	});
 
diff --git a/src/sample/sample.module.ts b/src/sample/sample.module.ts
@@ -4,9 +4,6 @@ import { CommonModule } from "@angular/common";
 import { Sample } from "./sample.component";
 import { SampleSub } from "./subcomponent/sample-sub.component";
 
-import { SampleBase } from "./sample-base.class";
-import { SampleInterface } from "./sample.interface";
-
 export { Sample } from "./sample.component";
 export { SampleSub } from "./subcomponent/sample-sub.component";
 
@@ -16,14 +13,14 @@ export { SampleInterface } from "./sample.interface";
 @NgModule({
 	declarations: [
 		Sample,
-		SampleSub,
+		SampleSub
 	],
 	exports: [
 		Sample,
-		SampleSub,
+		SampleSub
 	],
 	imports: [
-		CommonModule,
+		CommonModule
 	]
 })
 export class SampleModule {}
diff --git a/src/select/select.module.ts b/src/select/select.module.ts
@@ -21,7 +21,7 @@ import { OptGroup } from "./optgroup.directive";
 	],
 	imports: [
 		CommonModule,
-		FormsModule,
+		FormsModule
 	]
 })
 class SelectModule { }
diff --git a/src/switch/switch.stories.ts b/src/switch/switch.stories.ts
@@ -1,5 +1,4 @@
 import { storiesOf, moduleMetadata } from "@storybook/angular";
-import { action } from "@storybook/addon-actions";
 import { withKnobs, boolean } from "@storybook/addon-knobs/angular";
 
 import { SwitchModule } from "../";
@@ -13,6 +12,6 @@ storiesOf("Switch", module).addDecorator(
 	.add("Basic", () => ({
 		template: `<ibm-switch [disabled]="disabled"></ibm-switch>`,
 		props: {
-			disabled: boolean("disabled", false),
+			disabled: boolean("disabled", false)
 		}
 	}));
diff --git a/src/table/table.stories.ts b/src/table/table.stories.ts
@@ -63,7 +63,7 @@ class DynamicTableStory implements OnInit {
 			[new TableItem({data: "Name 1"}), new TableItem({data: {name: "Lessy", link: "/table"}, template: this.customTableItemTemplate})],
 			[new TableItem({data: "Name 3"}), new TableItem({data: "swer"})],
 			[new TableItem({data: "Name 2"}), new TableItem({data: {name: "Alice", surname: "Bob"}, template: this.customTableItemTemplate})],
-			[new TableItem({data: "Name 4"}), new TableItem({data: "twer"})],
+			[new TableItem({data: "Name 4"}), new TableItem({data: "twer"})]
 		];
 		this.model.header = [
 			new TableHeaderItem({data: "Very long title indeed"}),
@@ -144,7 +144,7 @@ class ExpansionTableStory implements OnInit {
 				new TableItem({data: "swer"})
 			],
 			[new TableItem({data: "Name 2"}), new TableItem({data: {name: "Alice", surname: "Bob"}, template: this.customTableItemTemplate})],
-			[new TableItem({data: "Name 4"}), new TableItem({data: "twer"})],
+			[new TableItem({data: "Name 4"}), new TableItem({data: "twer"})]
 		];
 		this.model.header = [
 			new TableHeaderItem({data: "Very long title indeed"}),
@@ -209,11 +209,11 @@ class OverflowTableStory implements OnInit {
 			[new TableItem({data: "Name 1"}), new TableItem({data: {id: "1"}, template: this.overflowMenuItemTemplate})],
 			[new TableItem({data: "Name 2"}), new TableItem({data: {id: "2"}, template: this.overflowMenuItemTemplate})],
 			[new TableItem({data: "Name 3"}), new TableItem({data: {id: "3"}, template: this.overflowMenuItemTemplate})],
-			[new TableItem({data: "Name 4"}), new TableItem({data: {id: "4"}, template: this.overflowMenuItemTemplate})],
+			[new TableItem({data: "Name 4"}), new TableItem({data: {id: "4"}, template: this.overflowMenuItemTemplate})]
 		];
 		this.model.header = [
 			new TableHeaderItem({data: "Name"}),
-			new TableHeaderItem({data: "Actions"}),
+			new TableHeaderItem({data: "Actions"})
 		];
 	}
 }
diff --git a/src/tabs/tabs.stories.ts b/src/tabs/tabs.stories.ts
@@ -1,7 +1,5 @@
 import { storiesOf, moduleMetadata } from "@storybook/angular";
-import { withNotes } from "@storybook/addon-notes";
-import { action } from "@storybook/addon-actions";
-import { withKnobs, boolean, object } from "@storybook/addon-knobs/angular";
+import { withKnobs } from "@storybook/addon-knobs/angular";
 
 import { TranslateModule } from "@ngx-translate/core";
 
@@ -13,7 +11,7 @@ storiesOf("Tabs", module)
 			imports: [
 				TabsModule,
 				TranslateModule.forRoot()
-			],
+			]
 		})
 	)
 	.addDecorator(withKnobs)
diff --git a/src/tiles/clickable-tile.component.spec.ts b/src/tiles/clickable-tile.component.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="../../node_modules/@types/jasmine/index.d.ts" />
 
-import { DebugElement, Component } from "@angular/core";
+import { Component } from "@angular/core";
 import {
 	async,
 	ComponentFixture,
@@ -13,7 +13,7 @@ import { ClickableTile } from "./clickable-tile.component";
 describe("ClickableTile", () => {
 	beforeEach(async(() => {
 		TestBed.configureTestingModule({
-			declarations: [ClickableTile, ClickableTileTestComponent],
+			declarations: [ClickableTile, ClickableTileTestComponent]
 		}).compileComponents();
 	}));
 
diff --git a/src/tiles/tile.component.spec.ts b/src/tiles/tile.component.spec.ts
@@ -14,7 +14,7 @@ describe("Tile", () => {
 
 	beforeEach(async(() => {
 		TestBed.configureTestingModule({
-			declarations: [Tile],
+			declarations: [Tile]
 		}).compileComponents();
 	}));
 
diff --git a/src/utils/position.ts b/src/utils/position.ts
@@ -33,12 +33,12 @@ function calculatePosition(referenceOffset: Offset, reference: HTMLElement, targ
 		case "top":
 			return {
 				top: Math.round(referenceOffset.top - target.offsetHeight),
-				left: referenceOffset.left - Math.round(target.offsetWidth / 2) + Math.round(referenceRect.width / 2),
+				left: referenceOffset.left - Math.round(target.offsetWidth / 2) + Math.round(referenceRect.width / 2)
 			};
 		case "bottom":
 			return {
 				top: Math.round(referenceOffset.top + referenceRect.height),
-				left: referenceOffset.left - Math.round(target.offsetWidth / 2) + Math.round(referenceRect.width / 2),
+				left: referenceOffset.left - Math.round(target.offsetWidth / 2) + Math.round(referenceRect.width / 2)
 			};
 		case "left-bottom":
 			return {
@@ -138,7 +138,7 @@ export namespace position {
 	export function addOffset(position: AbsolutePosition, top = 0, left = 0): AbsolutePosition {
 		return Object.assign({}, position, {
 			top: position.top + top,
-			left: position.left + left,
+			left: position.left + left
 		});
 	}
 
diff --git a/tslint.json b/tslint.json
@@ -84,6 +84,13 @@
 			true,
 			"always"
 		],
+		"trailing-comma": [
+			true,
+			{
+				"multiline": "never",
+				"singleline": "never"
+			}
+		],
 		"triple-equals": [
 			true,
 			"allow-null-check",

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ describe("Button Menu", () => {`
`35`	`35`	`provide: TranslateLoader, useClass: TranslateFakeLoader`
`36`	`36`	`}`
`37`	`37`	`})`
`38`		`- ],`
	`38`	`+ ]`
`39`	`39`	`});`
`40`	`40`	`});`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ storiesOf("Dropdown", module)`
`14`	`14`	`imports: [`
`15`	`15`	`DropdownModule,`
`16`	`16`	`BootstrapModule`
`17`		`- ],`
	`17`	`+ ]`
`18`	`18`	`})`
`19`	`19`	`)`
`20`	`20`	`.addDecorator(withKnobs)`