From f04763cecd158f77c9a392d922fbec7b6bab0bf1 Mon Sep 17 00:00:00 2001 From: KostyaDanovsky Date: Sat, 6 May 2017 15:35:15 +0300 Subject: [PATCH] style(lint): improve lint issues --- package.json | 1 + src/app/@core/core.module.ts | 4 +- .../components/tiny-mce/time-mce.component.ts | 5 +- .../layouts/one-column/one-column.layout.ts | 2 +- src/app/@theme/theme.module.ts | 2 +- src/app/app.component.ts | 2 +- .../pages/components/components.component.ts | 2 +- .../pages/dashboard/dashboard.component.ts | 2 +- .../pages/editors/editors-routing.module.ts | 3 +- .../editors/tiny-mce/tiny-mce.component.ts | 2 +- src/app/pages/editors/tinyMCE.component.ts | 56 ------------------- src/app/pages/maps/maps.component.ts | 2 +- src/app/pages/pages.component.ts | 6 +- src/index.html | 2 +- src/polyfills.ts | 2 - src/test.ts | 4 +- 16 files changed, 19 insertions(+), 78 deletions(-) delete mode 100644 src/app/pages/editors/tinyMCE.component.ts diff --git a/package.json b/package.json index f2a9beef..df95dabb 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "test": "ng test -sr", "test:coverage": "rimraf coverage && npm run test -- -cc", "lint": "ng lint", + "lint:fix": "ng lint --fix", "lint:styles": "stylelint ./src/**/*.scss", "lint:ci": "npm run lint && npm run lint:styles", "pree2e": "webdriver-manager update --standalone false --gecko false", diff --git a/src/app/@core/core.module.ts b/src/app/@core/core.module.ts index 9245df47..7440131d 100644 --- a/src/app/@core/core.module.ts +++ b/src/app/@core/core.module.ts @@ -5,9 +5,9 @@ import { throwIfAlreadyLoaded } from './module-import-guard'; @NgModule({ imports: [ - CommonModule + CommonModule, ], - declarations: [] + declarations: [], }) export class CoreModule { constructor(@Optional() @SkipSelf() parentModule: CoreModule) { diff --git a/src/app/@theme/components/tiny-mce/time-mce.component.ts b/src/app/@theme/components/tiny-mce/time-mce.component.ts index a50cfbf0..75c34b46 100644 --- a/src/app/@theme/components/tiny-mce/time-mce.component.ts +++ b/src/app/@theme/components/tiny-mce/time-mce.component.ts @@ -1,4 +1,4 @@ -import {Component, OnDestroy, AfterViewInit, Output, EventEmitter, ElementRef} from '@angular/core'; +import { Component, OnDestroy, AfterViewInit, Output, EventEmitter, ElementRef } from '@angular/core'; @Component({ selector: 'ngx-tiny-mce', @@ -20,8 +20,7 @@ export class TinyMCEComponent implements OnDestroy, AfterViewInit { setup: editor => { this.editor = editor; editor.on('keyup', () => { - let content = editor.getContent(); - this.editorKeyup.emit(content); + this.editorKeyup.emit(editor.getContent()); }); }, }); diff --git a/src/app/@theme/layouts/one-column/one-column.layout.ts b/src/app/@theme/layouts/one-column/one-column.layout.ts index 37a0902a..d915ee60 100644 --- a/src/app/@theme/layouts/one-column/one-column.layout.ts +++ b/src/app/@theme/layouts/one-column/one-column.layout.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; @Component({ - selector: 'one-column-layout', + selector: 'ngx-one-column-layout', template: ` diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts index e033ecfa..e4ca69bd 100644 --- a/src/app/@theme/theme.module.ts +++ b/src/app/@theme/theme.module.ts @@ -17,7 +17,7 @@ import { HeaderComponent, FooterComponent, SearchInputComponent, - TinyMCEComponent + TinyMCEComponent, } from './components'; import { OneColumnLayoutComponent } from './layouts'; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 9b07c0fd..9c0d8ef1 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -6,7 +6,7 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app', + selector: 'ngx-app', template: '', }) export class AppComponent { diff --git a/src/app/pages/components/components.component.ts b/src/app/pages/components/components.component.ts index 83ec0b72..5dca8c27 100644 --- a/src/app/pages/components/components.component.ts +++ b/src/app/pages/components/components.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; @Component({ - selector: 'components', + selector: 'ngx-components', template: `

components works! diff --git a/src/app/pages/dashboard/dashboard.component.ts b/src/app/pages/dashboard/dashboard.component.ts index 36125144..7ce07125 100644 --- a/src/app/pages/dashboard/dashboard.component.ts +++ b/src/app/pages/dashboard/dashboard.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; @Component({ - selector: 'dashboard', + selector: 'ngx-dashboard', template: ` Test card diff --git a/src/app/pages/editors/editors-routing.module.ts b/src/app/pages/editors/editors-routing.module.ts index 81dfa514..b136ce9c 100644 --- a/src/app/pages/editors/editors-routing.module.ts +++ b/src/app/pages/editors/editors-routing.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { EditorsComponent } from './editors.component'; -import { TinyMCEComponent, TinyMCEEditorComponent } from './tinyMCE.component'; +import { TinyMCEComponent } from './tiny-mce/tiny-mce.component'; import { CKEditorComponent } from './ckeditor.component'; const routes: Routes = [{ @@ -26,6 +26,5 @@ export class EditorsRoutingModule { } export const routedComponents = [ EditorsComponent, TinyMCEComponent, - TinyMCEEditorComponent, CKEditorComponent, ]; diff --git a/src/app/pages/editors/tiny-mce/tiny-mce.component.ts b/src/app/pages/editors/tiny-mce/tiny-mce.component.ts index 3fd7b99c..50754002 100644 --- a/src/app/pages/editors/tiny-mce/tiny-mce.component.ts +++ b/src/app/pages/editors/tiny-mce/tiny-mce.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'ngx-tiny-mce-page', diff --git a/src/app/pages/editors/tinyMCE.component.ts b/src/app/pages/editors/tinyMCE.component.ts deleted file mode 100644 index d94dfb63..00000000 --- a/src/app/pages/editors/tinyMCE.component.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { Component, OnDestroy, AfterViewInit, Input, Output, EventEmitter } from '@angular/core'; - -@Component({ - selector: 'ngx-tinymce-editor', - template: ` - - `, -}) -export class TinyMCEEditorComponent implements OnDestroy, AfterViewInit { - - @Input() elementId: string; - - @Output() editorKeyup = new EventEmitter(); - - editor: any; - - ngAfterViewInit() { - tinymce.init({ - selector: '#' + this.elementId, - plugins: ['link', 'paste', 'table'], - skin_url: 'assets/skins/lightgray', - setup: editor => { - this.editor = editor; - - editor.on('keyup', () => { - const content = editor.getContent(); - - this.editorKeyup.emit(content); - }); - }, - }); - } - - ngOnDestroy() { - tinymce.remove(this.editor); - } - -} - -@Component({ - selector: 'ngx-tinymce', - template: ` - - - - - - `, -}) -export class TinyMCEComponent { - - editorKeyupHandler($event) { - console.info($event); - } - -} diff --git a/src/app/pages/maps/maps.component.ts b/src/app/pages/maps/maps.component.ts index edc18c7d..e6c56dd9 100644 --- a/src/app/pages/maps/maps.component.ts +++ b/src/app/pages/maps/maps.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; @Component({ - selector: 'maps', + selector: 'ngx-maps', template: `

maps works! diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts index 12c5b591..681385b2 100644 --- a/src/app/pages/pages.component.ts +++ b/src/app/pages/pages.component.ts @@ -4,12 +4,12 @@ import 'style-loader!../@theme/styles/gorgeous/gorgeous.theme.scss'; import 'style-loader!../@theme/styles/pure/pure.theme.scss'; @Component({ - selector: 'pages', + selector: 'ngx-pages', template: ` - + - + `, }) export class PagesComponent { diff --git a/src/index.html b/src/index.html index 0c0033c7..72927d82 100644 --- a/src/index.html +++ b/src/index.html @@ -9,6 +9,6 @@ - Loading... + Loading... diff --git a/src/polyfills.ts b/src/polyfills.ts index c940e86e..d0418cde 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -54,14 +54,12 @@ import 'core-js/es7/reflect'; // import 'web-animations-js'; // Run `npm install --save web-animations-js`. - /*************************************************************************************************** * Zone JS is required by Angular itself. */ import 'zone.js/dist/zone'; // Included with Angular CLI. - /*************************************************************************************************** * APPLICATION IMPORTS */ diff --git a/src/test.ts b/src/test.ts index e42a2604..305f3ff6 100644 --- a/src/test.ts +++ b/src/test.ts @@ -14,7 +14,7 @@ import 'zone.js/dist/fake-async-test'; import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, - platformBrowserDynamicTesting + platformBrowserDynamicTesting, } from '@angular/platform-browser-dynamic/testing'; // Unfortunately there's no typing for the `__karma__` variable. Just declare it as any. @@ -27,7 +27,7 @@ __karma__.loaded = function () {}; // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( BrowserDynamicTestingModule, - platformBrowserDynamicTesting() + platformBrowserDynamicTesting(), ); // Then we find all the tests. const context = require.context('./', true, /\.spec\.ts$/);