Skip to content

Commit fcbc619

Browse files
committed
docs(cb-jquery-plugin): Integrating drag and drop
text feat(resources): add more pages. Increase font size. Rename in footer. All encompassing resource page chore(resources): update resources links and header and footer chore(presskit): make reuse permissions more clear chore(dart & ts): update to beta.17 Change `ngFor=“#…”` to `ngFor=“let…` in code. All are .dart files except for `app_component.html` which also has changes for: - `<inpuf var-foo…`> to `<input ref-foo…>` - `#docregion` tag name updates from var-foo to ref-foo. - Other misc updates to minimize diffs with TS version of file, whitespace differences were ignored. + Minor update to sync up Dart prose with TS prose. + Used https://github.com/angular/angular/wiki/Angular-2-Dart-Transformer#resol ved_identifiers to solve angular#1033 Guide/pipes not updated as it will be rolled back to beta.15 in PR angular#1220. chore(dart): pipes example rolled back to beta.15 The pipes example stopped working in beta.16; roll it back to the last known working version. See earlier commit for code changes necessary in support of beta.16: angular@0557c728d75e519bc6846b37492 414dff540c6ee docs(style-guide): add style-guide - v.5 docs: rename heros to heroes docs(lifecycle-hooks): update directive selector to camelCase closes angular#1236 docs(style-guide): add style-guide - v.6 docs: fix a few typos closes angular#1239 docs(style-guide): fix merge issues closes angular#1244 chore(updates): update resources and livestream hero chore(dgeni): update dgeni to handle repackaging changes feat(images): new frontpage as directed by Alex Wolfe. New images from Fatima Remtullah chore(hero): update hero banner for ngconf livestream feat(features: update features section) chore(dgeni): update dgeni to serve old and new router chore(copyedit): copyedits to feature page text feat(docs landing): new docs landing converts docs landing template to use layout classnames rather than attribute syntax chore: update to rc.0 docs: switch to commonjs module generation docs(style-guide): revisions for New World (repack) closes angular#1260 docs(samples): removed unused typings excludes from tsconfig docs(router): samples and doc for new router (phase 1) docs: update all docs to partially comply the style-guide docs(router): document new router and samples - phase 2 docs(quickstart): fix misplaced close paren docs(npm-packages): typo ES6 = ES2015 closes angular#1263 docs(quickstart.jade): Modify "Typescript type definition file" link up-to-date url closes angular#1262 docs(pipes): change description for parameters to reflect change in beta.16 closes angular#1197 docs(style-guide): fix some typos closes angular#1275 docs(style-guide): fix some typos (missed one) docs(ts/js): update to rc1 upgrade to rc1
1 parent 798a55b commit fcbc619

File tree

765 files changed

+10489
-4884
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

765 files changed

+10489
-4884
lines changed

gulpfile.js

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ var _exampleBoilerplateFiles = [
7777
'karma-test-shim.js',
7878
'package.json',
7979
'styles.css',
80+
'systemjs.config.js',
8081
'tsconfig.json',
8182
'tslint.json',
8283
'typings.json',

public/_data.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
},
77

88
"features": {
9-
"title": "Features & Benefits",
10-
"subtitle": "Powerful Features for Developing Apps"
9+
"title": "Features & Benefits"
1110
},
1211

1312
"contribute": {
@@ -17,8 +16,7 @@
1716
},
1817

1918
"news": {
20-
"title": "News",
21-
"subtitle": "Check out what we are up to"
19+
"title": "News"
2220
},
2321

2422
"events": {

public/_includes/_footer.jade

+15-25
Original file line numberDiff line numberDiff line change
@@ -13,47 +13,37 @@ else
1313
.c3.main-footer-branding
1414
.logo-inverse-large
1515

16-
.c2
16+
.c3
1717
h3.text-headline RESOURCES
1818

1919
ul.text-body
20-
li <a href="/presskit.html">Press Kit</a>
2120
// TODO: (ericjim) make a libraries page to showcase all angular 2 libraries
2221
//li <a href="/libraries.html">Libraries</a>
23-
li <a href="https://angularjs.org/"> Angular 1 for JS</a>
24-
li <a href="https://material.angularjs.org"> Angular Material</a>
25-
li <a href="https://www.firebase.com/docs/web/libraries/angular/"> AngularFire</a>
26-
27-
.c2
28-
h3.text-headline LEARN
22+
li <a href="/about/">About</a>
23+
li <a href="/resources/">Books & Training</a>
24+
li <a href="/resources/">Tools & Libraries</a>
25+
li <a href="/resources/">Community</a>
26+
li <a href="/presskit.html">Press Kit</a>
2927

30-
ul.text-body
31-
li <a href="/docs/ts/latest/guide/">Basics</a>
32-
li <a href="/books.html">Books</a>
33-
li <a href="/training.html">Training</a>
34-
li <a href="/docs/ts/latest/resources.html">Videos and Posts</a>
35-
li <a href="/tooling.html">Tooling & Libraries</a>
36-
li <a href="/communities.html">Communities</a>
37-
//li <a href="http://goo.gl/sj0Nk1">Design Docs &amp; Notes</a>
38-
39-
.c2
28+
.c3
4029
h3.text-headline HELP
4130

4231
ul.text-body
43-
li <a href="/contribute.html"> Contribute</a>
44-
li <a href="/support.html">Support Page</a>
45-
li <a href="https://github.com/angular/angular/issues"> File a Ticket</a>
46-
li <a class="footer-feedback" ng-click="appCtrl.openFeedback()" aria-label="Submit feedback on this page"> Product Feedback</a>
32+
li <a href="http://stackoverflow.com/questions/tagged/angular2">Stack Overflow</a>
33+
li <a href="https://gitter.im/angular/angular">Gitter</a>
34+
li <a href="https://groups.google.com/forum/#!forum/angular"> Google Group</a>
35+
li <a href="https://github.com/angular/angular/issues"> Report Issues</a>
36+
li <a class="footer-feedback" ng-click="appCtrl.openFeedback()" aria-label="Submit feedback on this page"> Site Feedback</a>
4737

4838
.c3
4939
h3.text-headline COMMUNITY
5040

5141
ul.text-body
52-
li <a href="/events.html"> Events & Meetups</a>
53-
li <a href="https://groups.google.com/forum/#!forum/angular"> Google Group</a>
54-
li <a href="https://plus.sandbox.google.com/+AngularJS/posts"> Google+</a>
42+
li <a href="/events.html">Events</a>
43+
li <a href="http://www.meetup.com/topics/angularjs/">Meetups</a>
5544
li <a href="https://twitter.com/angularjs"> Twitter</a>
5645
li <a href="https://github.com/angular/angular"> GitHub</a>
46+
li <a href="/contribute.html"> Contribute</a>
5747

5848

5949
footer(class="background-steel")

public/_includes/_hero-home.jade

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ header(class="background-sky")
55
.hero-cta
66
a(href="/docs/ts/latest/quickstart.html" class="md-raised button button-large button-plain" md-button) Get Started
77

8-
.banner.is-centered
8+
.banner.banner-floaty
99
.banner-ng-annoucement
10-
h4 Announcing Angular Attack — a 48 hour online hackathon on May 14 - 15th, 2016.&nbsp;
11-
a(href="https://www.angularattack.com/" target="_blank") Register Today
10+
div(class="banner-text")
11+
p Watch the ng-conf Live Stream May 4th-6th.&nbsp;
12+
div(class="banner-button")
13+
a(href="https://www.ng-conf.org/#/extended" target="_blank" class="button md-button") View Live Stream

public/_includes/_main-nav.jade

-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ md-toolbar(class="main-nav background-regal l-pinned-top l-layer-5",scroll-y-off
1212
li.l-left <a class="main-nav-button" href="/docs/#{language}/latest/" md-button>Docs</a>
1313
li.l-left <a class="main-nav-button" href="/events.html" md-button>Events</a>
1414
li.l-left <a class="main-nav-button" href="/news.html" md-button>News</a>
15-
li.l-left <a class="main-nav-button" href="/about/" md-button>About</a>
1615
li.l-right <a class="main-nav-button" href="/docs/ts/latest/quickstart.html" md-button>Get Started</a>

public/docs/_examples/.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ tslint.json
1515
wallaby.js
1616
npm-debug*.
1717
protractor.config.js
18+
systemjs.config.js
1819
_test-output
1920
_temp
21+
**/ts/**/*.js
22+
**/ts-snippets/**/*.js
23+
**/ts/**/*.d.ts
2024

2125
!**/*e2e-spec.js
26+
!systemjs.config.1.js

public/docs/_examples/architecture/dart/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version: 0.0.1
55
environment:
66
sdk: '>=1.13.0 <2.0.0'
77
dependencies:
8-
angular2: 2.0.0-beta.16
8+
angular2: 2.0.0-beta.17
99
browser: ^0.10.0
1010
dart_to_js_script_rewriter: ^1.0.1
1111
transformers:

public/docs/_examples/architecture/ts/.gitignore

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// #docregion import
2-
import {Component} from 'angular2/core';
2+
import { Component } from '@angular/core';
33
// #enddocregion import
4-
import {HeroListComponent} from './hero-list.component';
5-
import {SalesTaxComponent} from './sales-tax.component';
4+
import { HeroListComponent } from './hero-list.component';
5+
import { SalesTaxComponent } from './sales-tax.component';
66

77
@Component({
88
selector: 'my-app',
@@ -14,4 +14,4 @@ import {SalesTaxComponent} from './sales-tax.component';
1414
})
1515
// #docregion export
1616
export class AppComponent { }
17-
// #enddocregion export
17+
// #enddocregion export
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import {Injectable, Type} from 'angular2/core';
2-
import {Logger} from './logger.service';
3-
import {Hero} from './hero';
1+
import { Injectable, Type } from '@angular/core';
2+
3+
import { Logger } from './logger.service';
4+
import { Hero } from './hero';
45

56
const HEROES = [
67
new Hero('Windstorm', 'Weather mastery'),
@@ -10,15 +11,15 @@ const HEROES = [
1011

1112
@Injectable()
1213
export class BackendService {
13-
constructor(private _logger: Logger) {}
14+
constructor(private logger: Logger) {}
1415

1516
getAll(type:Type) : PromiseLike<any[]>{
1617
if (type === Hero) {
1718
// TODO get from the database
1819
return Promise.resolve<Hero[]>(HEROES);
1920
}
2021
let err = new Error('Cannot get object of this type');
21-
this._logger.error(err);
22+
this.logger.error(err);
2223
throw err;
2324
}
24-
}
25+
}
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import {Component, Input} from 'angular2/core';
2-
import {Hero} from './hero';
1+
import { Component, Input} from '@angular/core';
2+
3+
import { Hero } from './hero';
34

45
@Component({
56
selector: 'hero-detail',
67
templateUrl: 'app/hero-detail.component.html',
78
directives: [HeroDetailComponent]
89
})
910
export class HeroDetailComponent {
10-
@Input() hero:Hero;
11-
}
11+
@Input() hero: Hero;
12+
}

public/docs/_examples/architecture/ts/app/hero-list.component.ts

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
// #docplaster
2-
import {Component, OnInit} from 'angular2/core';
3-
import {Hero} from './hero';
4-
import {HeroDetailComponent} from './hero-detail.component';
5-
import {HeroService} from './hero.service';
2+
import { Component, OnInit } from '@angular/core';
3+
4+
import { Hero } from './hero';
5+
import { HeroDetailComponent } from './hero-detail.component';
6+
import { HeroService } from './hero.service';
67

78
// #docregion metadata
89
// #docregion providers
@@ -24,14 +25,14 @@ export class HeroesComponent { ... }
2425
// #docregion class
2526
export class HeroListComponent implements OnInit {
2627
// #docregion ctor
27-
constructor(private _service: HeroService){ }
28+
constructor(private service: HeroService) { }
2829
// #enddocregion ctor
2930

30-
heroes:Hero[];
31+
heroes: Hero[];
3132
selectedHero: Hero;
3233

33-
ngOnInit(){
34-
this.heroes = this._service.getHeroes();
34+
ngOnInit() {
35+
this.heroes = this.service.getHeroes();
3536
}
3637

3738
selectHero(hero: Hero) { this.selectedHero = hero; }
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
import {Injectable} from 'angular2/core';
2-
import {Hero} from './hero';
3-
import {BackendService} from './backend.service';
4-
import {Logger} from './logger.service';
1+
import { Injectable } from '@angular/core';
2+
3+
import { Hero } from './hero';
4+
import { BackendService } from './backend.service';
5+
import { Logger } from './logger.service';
56

67
@Injectable()
78
// #docregion class
89
export class HeroService {
910
// #docregion ctor
1011
constructor(
11-
private _backend: BackendService,
12-
private _logger: Logger) { }
12+
private backend: BackendService,
13+
private logger: Logger) { }
1314
// #enddocregion ctor
1415

15-
private _heroes:Hero[] = [];
16+
private heroes: Hero[] = [];
1617

1718
getHeroes() {
18-
this._backend.getAll(Hero).then( (heroes:Hero[]) => {
19-
this._logger.log(`Fetched ${heroes.length} heroes.`);
20-
this._heroes.push(...heroes); // fill cache
19+
this.backend.getAll(Hero).then( (heroes: Hero[]) => {
20+
this.logger.log(`Fetched ${heroes.length} heroes.`);
21+
this.heroes.push(...heroes); // fill cache
2122
});
22-
return this._heroes;
23+
return this.heroes;
2324
}
2425
}
25-
// #enddocregion class
26+
// #enddocregion class
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
let nextId = 1;
2+
13
export class Hero {
2-
id:number
4+
id: number;
35
constructor(
4-
public name:string,
5-
public power?:string){
6+
public name: string,
7+
public power?: string) {
68
this.id = nextId++;
79
}
810
}
9-
10-
var nextId = 1;
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// #docregion
2-
import {Injectable} from 'angular2/core';
2+
import { Injectable } from '@angular/core';
33

44
@Injectable()
55
// #docregion class
@@ -8,4 +8,4 @@ export class Logger {
88
error(msg: any) { console.error(msg); }
99
warn(msg: any) { console.warn(msg); }
1010
}
11-
// #enddocregion class
11+
// #enddocregion class

public/docs/_examples/architecture/ts/app/main.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {bootstrap} from 'angular2/platform/browser';
1+
import { bootstrap } from '@angular/platform-browser-dynamic';
22
// #docregion import
3-
import {AppComponent} from './app.component';
3+
import { AppComponent } from './app.component';
44
// #enddocregion import
5-
import {HeroService} from './hero.service';
6-
import {BackendService} from './backend.service';
7-
import {Logger} from './logger.service';
5+
import { HeroService } from './hero.service';
6+
import { BackendService } from './backend.service';
7+
import { Logger } from './logger.service';
88

99
// #docregion bootstrap
1010
bootstrap(AppComponent, [BackendService, HeroService, Logger]);

public/docs/_examples/architecture/ts/app/sales-tax.component.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
// #docplaster
22
// #docregion
3-
import {Component} from 'angular2/core';
4-
import {SalesTaxService} from './sales-tax.service';
5-
import {TaxRateService} from './tax-rate.service';
3+
import { Component } from '@angular/core';
4+
5+
import { SalesTaxService } from './sales-tax.service';
6+
import { TaxRateService } from './tax-rate.service';
67

78
// #docregion metadata
89
// #docregion providers
@@ -12,7 +13,7 @@ import {TaxRateService} from './tax-rate.service';
1213
template: `
1314
<h2>Sales Tax Calculator</h2>
1415
Amount: <input #amountBox (change)="0">
15-
16+
1617
<div *ngIf="amountBox.value">
1718
The sales tax is
1819
{{ getTax(amountBox.value) | currency:'USD':true:'1.2-2' }}
@@ -31,11 +32,11 @@ export class SalesTaxComponent { ... }
3132
// #docregion class
3233
export class SalesTaxComponent {
3334
// #docregion ctor
34-
constructor(private _salesTaxService: SalesTaxService) { }
35+
constructor(private salesTaxService: SalesTaxService) { }
3536
// #enddocregion ctor
3637

3738
getTax(value:string | number){
38-
return this._salesTaxService.getVAT(value);
39+
return this.salesTaxService.getVAT(value);
3940
}
4041
}
4142
// #enddocregion class
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
// #docregion
2-
import {Injectable, Inject} from 'angular2/core';
3-
import {TaxRateService} from './tax-rate.service';
2+
import { Inject, Injectable } from '@angular/core';
3+
4+
import { TaxRateService } from './tax-rate.service';
45

56
// #docregion class
67
@Injectable()
78
export class SalesTaxService {
8-
constructor(private _rateService: TaxRateService) { }
9+
constructor(private rateService: TaxRateService) { }
910
getVAT(value:string | number){
1011
let amount:number;
1112
if (typeof value === "string"){
1213
amount = parseFloat(value);
1314
} else {
1415
amount = value;
1516
}
16-
return (amount || 0) * this._rateService.getRate('VAT');
17+
return (amount || 0) * this.rateService.getRate('VAT');
1718
}
1819
}
19-
// #enddocregion class
20+
// #enddocregion class
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// #docregion
2-
import {Injectable} from 'angular2/core';
2+
import { Injectable } from '@angular/core';
33

44
// #docregion class
55
@Injectable()
66
export class TaxRateService {
77
getRate(rateName:string){return 0.10;} // always 10% everywhere
88
}
9-
// #enddocregion class
9+
// #enddocregion class

0 commit comments

Comments
 (0)