Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 0c99a67

Browse files
committed
more whitespace styles
1 parent b60676f commit 0c99a67

26 files changed

+308
-36
lines changed

public/docs/_examples/style-guide/ts/03-03/app/shared/hero-collector.service.avoid.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// #docregion
22
// #docregion example
33
/* avoid */
4+
45
import { Injectable } from 'angular2/core';
56

67
import { IHero } from './hero.model.avoid';
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// #docregion
2+
// #docregion example
3+
export class Hero {
4+
name: string;
5+
power: string;
6+
}
7+
// #enddocregion example
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// #docregion
2+
// #docregion example
3+
/* avoid */
4+
5+
import {Injectable} from 'angular2/core';
6+
import {Http, Response} from 'angular2/http';
7+
8+
import {Hero} from './hero.model';
9+
import {ExceptionService, SpinnerService, ToastService} from '../../../app/shared';
10+
// #enddocregion example
11+
12+
@Injectable()
13+
export class HeroService {
14+
15+
constructor(
16+
private exceptionService: ExceptionService,
17+
private spinnerService: SpinnerService,
18+
private toastService: ToastService,
19+
private http: Http
20+
) { }
21+
22+
getHero(id: number) {
23+
return this.http.get(`api/heroes/${id}`)
24+
.map((res: Response) => res.json().data);
25+
}
26+
27+
getHeroes() {
28+
return this.http.get(`api/heroes`)
29+
.map((res: Response) => res.json().data);
30+
}
31+
32+
}
33+
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// #docregion
2+
// #docregion example
3+
import { Injectable } from 'angular2/core';
4+
import { Http, Response } from 'angular2/http';
5+
6+
import { Hero } from './hero.model';
7+
import { ExceptionService, SpinnerService, ToastService } from '../../../app/shared';
8+
// #enddocregion example
9+
10+
@Injectable()
11+
export class HeroService {
12+
13+
constructor(
14+
private exceptionService: ExceptionService,
15+
private spinnerService: SpinnerService,
16+
private toastService: ToastService,
17+
private http: Http
18+
) { }
19+
20+
getHero(id: number) {
21+
return this.http.get(`api/heroes/${id}`)
22+
.map((res: Response) => res.json().data);
23+
}
24+
25+
getHeroes() {
26+
return this.http.get(`api/heroes`)
27+
.map((res: Response) => res.json().data);
28+
}
29+
30+
}
31+
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { Injectable } from 'angular2/core';
2+
3+
@Injectable()
4+
export class ExceptionService { }
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// #docregion
2+
// #docregion example
3+
export * from './exception.service';
4+
export * from './spinner';
5+
export * from './toast';
6+
// #enddocregion example

public/docs/_examples/style-guide/ts/03-05/app/shared/nav/nav.component.avoid.ts

Lines changed: 0 additions & 17 deletions
This file was deleted.

public/docs/_examples/style-guide/ts/03-05/app/shared/nav/nav.component.ts

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// #docregion
2+
export * from './spinner.component';
3+
export * from './spinner.service';
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import {Component, OnDestroy, OnInit} from 'angular2/core';
2+
3+
import { SpinnerService } from './spinner.service';
4+
5+
@Component({
6+
selector: 'toh-spinner',
7+
template: '<div>spinner</div>'
8+
})
9+
10+
export class SpinnerComponent implements OnDestroy, OnInit {
11+
constructor(private spinnerService: SpinnerService) { }
12+
13+
ngOnInit() { }
14+
15+
ngOnDestroy() { }
16+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { Injectable } from 'angular2/core';
2+
3+
export interface ISpinnerState { }
4+
5+
@Injectable()
6+
export class SpinnerService {
7+
spinnerState: any;
8+
9+
show() { }
10+
11+
hide() { }
12+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// #docregion
2+
export * from './toast.component';
3+
export * from './toast.service';
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { Component, OnInit } from 'angular2/core';
2+
3+
import { ToastService } from './toast.service';
4+
5+
@Component({
6+
moduleId: __moduleName,
7+
selector: 'toh-toast',
8+
templateUrl: '<div>toast</div>'
9+
})
10+
export class ToastComponent implements OnInit {
11+
constructor(toastService: ToastService) { }
12+
13+
ngOnInit() { }
14+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { Injectable } from 'angular2/core';
2+
3+
@Injectable()
4+
export class ToastService {
5+
activate: (message?: string, title?: string) => void;
6+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// #docregion
2+
// #docregion example
3+
export class Hero {
4+
name: string;
5+
power: string;
6+
}
7+
// #enddocregion example
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// #docregion
2+
// #docregion example
3+
/* avoid */
4+
5+
import { ExceptionService, SpinnerService, ToastService } from '../../../app/shared';
6+
import { Http, Response } from 'angular2/http';
7+
import { Injectable } from 'angular2/core';
8+
import { Hero } from './hero.model';
9+
// #enddocregion example
10+
11+
@Injectable()
12+
export class HeroService {
13+
14+
constructor(
15+
private exceptionService: ExceptionService,
16+
private spinnerService: SpinnerService,
17+
private toastService: ToastService,
18+
private http: Http
19+
) { }
20+
21+
getHero(id: number) {
22+
return this.http.get(`api/heroes/${id}`)
23+
.map((res: Response) => res.json().data);
24+
}
25+
26+
getHeroes() {
27+
return this.http.get(`api/heroes`)
28+
.map((res: Response) => res.json().data);
29+
}
30+
31+
}
32+
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// #docregion
2+
// #docregion example
3+
import { Injectable } from 'angular2/core';
4+
import { Http, Response } from 'angular2/http';
5+
6+
import { Hero } from './hero.model';
7+
import { ExceptionService, SpinnerService, ToastService } from '../../../app/shared';
8+
// #enddocregion example
9+
10+
@Injectable()
11+
export class HeroService {
12+
13+
constructor(
14+
private exceptionService: ExceptionService,
15+
private spinnerService: SpinnerService,
16+
private toastService: ToastService,
17+
private http: Http
18+
) { }
19+
20+
getHero(id: number) {
21+
return this.http.get(`api/heroes/${id}`)
22+
.map((res: Response) => res.json().data);
23+
}
24+
25+
getHeroes() {
26+
return this.http.get(`api/heroes`)
27+
.map((res: Response) => res.json().data);
28+
}
29+
30+
}
31+
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { Injectable } from 'angular2/core';
2+
3+
@Injectable()
4+
export class ExceptionService { }
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// #docregion
2+
// #docregion example
3+
export * from './exception.service';
4+
export * from './spinner';
5+
export * from './toast';
6+
// #enddocregion example
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// #docregion
2+
export * from './spinner.component';
3+
export * from './spinner.service';
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import {Component, OnDestroy, OnInit} from 'angular2/core';
2+
3+
import { SpinnerService } from './spinner.service';
4+
5+
@Component({
6+
selector: 'toh-spinner',
7+
template: '<div>spinner</div>'
8+
})
9+
10+
export class SpinnerComponent implements OnDestroy, OnInit {
11+
constructor(private spinnerService: SpinnerService) { }
12+
13+
ngOnInit() { }
14+
15+
ngOnDestroy() { }
16+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { Injectable } from 'angular2/core';
2+
3+
export interface ISpinnerState { }
4+
5+
@Injectable()
6+
export class SpinnerService {
7+
spinnerState: any;
8+
9+
show() { }
10+
11+
hide() { }
12+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// #docregion
2+
export * from './toast.component';
3+
export * from './toast.service';
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { Component, OnInit } from 'angular2/core';
2+
3+
import { ToastService } from './toast.service';
4+
5+
@Component({
6+
moduleId: __moduleName,
7+
selector: 'toh-toast',
8+
templateUrl: '<div>toast</div>'
9+
})
10+
export class ToastComponent implements OnInit {
11+
constructor(toastService: ToastService) { }
12+
13+
ngOnInit() { }
14+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { Injectable } from 'angular2/core';
2+
3+
@Injectable()
4+
export class ToastService {
5+
activate: (message?: string, title?: string) => void;
6+
}

public/docs/ts/latest/guide/style-guide.jade

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -611,22 +611,56 @@ a(href="#toc") Back to top
611611

612612
.l-main-section
613613
:marked
614-
### Import Spacing
614+
### Import Destructuring Spacing
615615
<a id="03-05"></a>
616616
#### Style 03-05
617617

618618
.s-rule.do
619619
:marked
620-
**Do** leave one whitespace character inside of the `import` statements' curly braces.
620+
**Do** leave one whitespace character inside of the `import` statements' curly braces when destructuring.
621621

622622
.s-why
623623
:marked
624624
**Why?** Whitespace makes it easier to read the imports.
625625

626-
+makeExample('style-guide/ts/03-04/app/shared/nav/nav.service.avoid.ts', 'example', 'app/shared/nav/nav.service.ts')(avoid=1)
626+
+makeExample('style-guide/ts/03-05/app/+heroes/shared/hero.service.avoid.ts', 'example', 'app/+heroes/shared/hero.service.ts')(avoid=1)
627627
:marked
628628

629-
+makeExample('style-guide/ts/03-04/app/shared/nav/nav.service.ts', 'example', 'app/shared/nav/nav.service.ts')
629+
+makeExample('style-guide/ts/03-05/app/+heroes/shared/hero.service.ts', 'example', 'app/+heroes/shared/hero.service.ts')
630+
:marked
631+
632+
a(href="#toc") Back to top
633+
634+
.l-main-section
635+
:marked
636+
### Import Line Spacing
637+
<a id="03-06"></a>
638+
#### Style 03-06
639+
640+
.s-rule.do
641+
:marked
642+
**Do** leave one empty line between third party imports and imports of code we created.
643+
644+
.s-rule.do
645+
:marked
646+
**Do** list import lines alphabetized by the module.
647+
648+
.s-rule.do
649+
:marked
650+
**Do** list destructured imported assets alphabetized.
651+
652+
.s-why
653+
:marked
654+
**Why?** The empty line makes it easy to read and locate imports.
655+
656+
.s-why
657+
:marked
658+
**Why?** Alphabetizing makes it easier to read and locate imports.
659+
660+
+makeExample('style-guide/ts/03-06/app/+heroes/shared/hero.service.avoid.ts', 'example', 'app/+heroes/shared/hero.service.ts')(avoid=1)
661+
:marked
662+
663+
+makeExample('style-guide/ts/03-06/app/+heroes/shared/hero.service.ts', 'example', 'app/+heroes/shared/hero.service.ts')
630664
:marked
631665

632666
a(href="#toc") Back to top

0 commit comments

Comments
 (0)