From 6334749d2c30e239321aba153db243f01647a6fe Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Thu, 30 Jul 2020 13:03:15 +0300 Subject: [PATCH] refactor(docs-infra): fix docs examples for tslint rule `member-ordering` (#38143) This commit updates the docs examples to be compatible with the `member-ordering` tslint rule. This is in preparation of updating the docs examples `tslint.json` to match the one generated for new Angular CLI apps in a future commit. PR Close #38143 --- .../animations/src/app/open-close.component.ts | 11 +++++------ .../built-in-directives/src/app/app.component.ts | 12 +++++++++--- .../lifecycle-hooks/src/app/after-view.component.ts | 5 +++-- .../app/phone-detail/phone-detail.component.ts | 1 + .../app/phone-list/phone-list.component.ts | 1 + .../app/phone-detail/phone-detail.component.ajs.ts | 1 + .../app/phone-list/phone-list.component.ajs.ts | 1 + 7 files changed, 21 insertions(+), 11 deletions(-) diff --git a/aio/content/examples/animations/src/app/open-close.component.ts b/aio/content/examples/animations/src/app/open-close.component.ts index 98d7dba9fe..c3b5bcf633 100644 --- a/aio/content/examples/animations/src/app/open-close.component.ts +++ b/aio/content/examples/animations/src/app/open-close.component.ts @@ -8,8 +8,7 @@ import { trigger, transition, state, animate, style, AnimationEvent } from '@ang // #docregion trigger, trigger-wildcard1, trigger-transition animations: [ trigger('openClose', [ -// #enddocregion events1 -// #docregion state1, events1 +// #docregion state1 // ... // #enddocregion events1 state('open', style({ @@ -34,8 +33,7 @@ import { trigger, transition, state, animate, style, AnimationEvent } from '@ang transition('closed => open', [ animate('0.5s') ]), -// #enddocregion trigger, component -// #enddocregion transition2 +// #enddocregion transition2, trigger, component // #docregion trigger-wildcard1 transition('* => closed', [ animate('1s') @@ -70,7 +68,9 @@ import { trigger, transition, state, animate, style, AnimationEvent } from '@ang }) // #docregion events export class OpenCloseComponent { -// #enddocregion events1, events +// #enddocregion events1, events, component + @Input() logging = false; +// #docregion component isOpen = true; toggle() { @@ -78,7 +78,6 @@ export class OpenCloseComponent { } // #enddocregion component - @Input() logging = false; // #docregion events1, events onAnimationEvent( event: AnimationEvent ) { // #enddocregion events1, events diff --git a/aio/content/examples/built-in-directives/src/app/app.component.ts b/aio/content/examples/built-in-directives/src/app/app.component.ts index f8024c90c9..10a37ee371 100644 --- a/aio/content/examples/built-in-directives/src/app/app.component.ts +++ b/aio/content/examples/built-in-directives/src/app/app.component.ts @@ -30,6 +30,14 @@ export class AppComponent implements OnInit { itemsWithTrackByCountReset = 0; itemIdIncrement = 1; + // #docregion setClasses + currentClasses: {}; + // #enddocregion setClasses + + // #docregion setStyles + currentStyles: {}; + // #enddocregion setStyles + ngOnInit() { this.resetItems(); this.setCurrentClasses(); @@ -41,8 +49,7 @@ export class AppComponent implements OnInit { this.currentItem.name = name.toUpperCase(); } -// #docregion setClasses - currentClasses: {}; + // #docregion setClasses setCurrentClasses() { // CSS classes: added/removed per current state of component properties this.currentClasses = { @@ -54,7 +61,6 @@ export class AppComponent implements OnInit { // #enddocregion setClasses // #docregion setStyles - currentStyles: {}; setCurrentStyles() { // CSS styles: set per current state of component properties this.currentStyles = { diff --git a/aio/content/examples/lifecycle-hooks/src/app/after-view.component.ts b/aio/content/examples/lifecycle-hooks/src/app/after-view.component.ts index 3198570926..9d84dada73 100644 --- a/aio/content/examples/lifecycle-hooks/src/app/after-view.component.ts +++ b/aio/content/examples/lifecycle-hooks/src/app/after-view.component.ts @@ -32,6 +32,9 @@ export class ChildViewComponent { }) // #docregion hooks export class AfterViewComponent implements AfterViewChecked, AfterViewInit { + // #enddocregion hooks + comment = ''; + // #docregion hooks private prevHero = ''; // Query for a VIEW child of type `ChildViewComponent` @@ -61,8 +64,6 @@ export class AfterViewComponent implements AfterViewChecked, AfterViewInit { } // #enddocregion hooks - comment = ''; - // #docregion do-something // This surrogate for real business logic sets the `comment` private doSomething() { diff --git a/aio/content/examples/upgrade-phonecat-1-typescript/app/phone-detail/phone-detail.component.ts b/aio/content/examples/upgrade-phonecat-1-typescript/app/phone-detail/phone-detail.component.ts index 657c663a9a..353eb08e99 100644 --- a/aio/content/examples/upgrade-phonecat-1-typescript/app/phone-detail/phone-detail.component.ts +++ b/aio/content/examples/upgrade-phonecat-1-typescript/app/phone-detail/phone-detail.component.ts @@ -1,3 +1,4 @@ +/* tslint:disable: member-ordering */ // #docregion class PhoneDetailController { phone: any; diff --git a/aio/content/examples/upgrade-phonecat-1-typescript/app/phone-list/phone-list.component.ts b/aio/content/examples/upgrade-phonecat-1-typescript/app/phone-list/phone-list.component.ts index e2f2855ae6..ee98c5492a 100644 --- a/aio/content/examples/upgrade-phonecat-1-typescript/app/phone-list/phone-list.component.ts +++ b/aio/content/examples/upgrade-phonecat-1-typescript/app/phone-list/phone-list.component.ts @@ -1,3 +1,4 @@ +/* tslint:disable: member-ordering */ // #docregion class PhoneListController { phones: any[]; diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.component.ajs.ts b/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.component.ajs.ts index 19b2b7dd1b..e48cf0ef0e 100644 --- a/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.component.ajs.ts +++ b/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.component.ajs.ts @@ -1,3 +1,4 @@ +/* tslint:disable: member-ordering */ // #docregion declare var angular: angular.IAngularStatic; import { Phone, PhoneData } from '../core/phone/phone.service'; diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-list/phone-list.component.ajs.ts b/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-list/phone-list.component.ajs.ts index 81eac1cd81..2c73f5309e 100644 --- a/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-list/phone-list.component.ajs.ts +++ b/aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-list/phone-list.component.ajs.ts @@ -1,3 +1,4 @@ +/* tslint:disable: member-ordering */ // #docregion declare var angular: angular.IAngularStatic; import { Phone, PhoneData } from '../core/phone/phone.service';