Skip to content

Commit dcf96d1

Browse files
committed
Squashed commit of the following:
commit 7c8938a Author: Patrice Chalin <chalin@users.noreply.github.com> Date: Fri Nov 18 07:53:41 2016 -0800 example(pipes): Dart e2e fix (angular#2825) Match TS example and only bootstrap AppComponent. commit 1c2d14a Author: Patrice Chalin <chalin@users.noreply.github.com> Date: Thu Nov 17 16:53:28 2016 -0800 docs(guide & api): feedback/issue links for Dart should refer to Dart repos (angular#2821) * docs(guide/index): feedback link to Dart repo for Dart - Also added links to chapters mentioned in table. - Other minor copyedits. * docs(api): issue links should refer to Dart repo * post-review updates * add link to Advance and Guide chapters * ensure that we can determine which language is active commit e59cd9a Author: Eric Jimenez <eric.jimenez.dev@gmail.com> Date: Thu Nov 17 18:02:32 2016 -0500 chore: remove deprecated `clear=` and use clear layout helpers (angular#2822) * define clear layout helpers * replace deprecated clear= with helper commit bde8fe1 Author: Eric Jimenez <eric.jimenez.dev@gmail.com> Date: Thu Nov 17 17:54:42 2016 -0500 remove grid fluid from dart api list (angular#2823) commit f993315 Author: Patrice Chalin <chalin@users.noreply.github.com> Date: Thu Nov 17 14:10:28 2016 -0800 chore(dart): complete the renaming of "Angular 2" to "Angular" (angular#2820) Contributes to angular#2407 - Dropped the “2” in “Angular 2” and “angular2_*” where appropriate. - Did a partial sync of `_cache/guide/pipes.jade` - In quickstart, changed `Try changing the message to "Hello Angular 2!”` to `Try changing the message to "Hello Again Angular!”`. commit d853a29 Author: Patrice Chalin <chalin@users.noreply.github.com> Date: Thu Nov 17 13:47:51 2016 -0800 examples(dart): demote some packages to dev_dependencies (angular#2818) Fixes angular#2777 commit 7febba6 Author: Kenny John Jacob <johnjacobkenny@gmail.com> Date: Fri Nov 18 02:24:55 2016 +0530 docs(router): fix missing anchor id (angular#2817) The link *Importing from the router library* (https://angular.io/docs/ts/latest/guide/router.html#import) does not work. I supposed that this was the corresponding section to be linked to. commit 2a3dbe5 Author: Eric Jimenez <eric.jimenez.dev@gmail.com> Date: Thu Nov 17 12:37:14 2016 -0500 replace clearfix with a wrapping flexbox (angular#2819) commit 061e50f Author: Patrice Chalin <chalin@users.noreply.github.com> Date: Wed Nov 16 10:02:31 2016 -0800 docs: adjust page heading levels (angular#2813) * docs: adjust page heading levels Only the page TOC should be at heading level 1. All other headings should start at level 2. This commit also removes duplicate headings, in continuation of angular#2796. (This fix is necessary to support an auto-TOC feature.) commit 31e0101 Author: Filipe Silva <filipematossilva@gmail.com> Date: Wed Nov 16 17:51:06 2016 +0000 fix(live-example): correctly match example name (angular#2815) Currently, when visiting a page with a relative link e.g. https://angular.io/docs/ts/latest/guide/testing.html#!#top, `NgIoUtil.getExampleName` fails to match the example name. This results on `live-example` directives on that page missing the example name in the link: instead of linking to https://angular.io/resources/live-examples/testing/ts/plnkr.html it will link to https://angular.io/resources/live-examples//ts/plnkr.html (notice the missing `testing` and the double slashes). commit e0aecb3 Author: Patrice Chalin <chalin@users.noreply.github.com> Date: Tue Nov 15 15:38:02 2016 -0800 docs(struct-directives): update Dart cache (angular#2806) Only minor prose edits in this PR. No net change in the generated HTML for the TS side. commit 0dfda08 Author: Patrice Chalin <chalin@users.noreply.github.com> Date: Tue Nov 15 15:36:34 2016 -0800 docs: in links use href=foo#bar not foo#!#bar (angular#2807) commit 64bce18 Author: Patrice Chalin <chalin@users.noreply.github.com> Date: Tue Nov 15 14:58:56 2016 -0800 e2e(dependency-injection): fix for Dart and simplification for TS Fixes angular#2493 No need to dual boot `AppComponent` and `ProvidersComponent` only to ensure that we could demo optional injection; instead just inject null for the `@Optional` constructor parameter type. No prose is affected by these changes. commit 4a4144e Author: Patrice Chalin <chalin@users.noreply.github.com> Date: Tue Nov 15 14:55:33 2016 -0800 docs(tutorial): update Dart cache for toh intro (angular#2805) commit f70ba97 Author: Patrice Chalin <chalin@users.noreply.github.com> Date: Tue Nov 15 08:39:03 2016 -0800 example(architecture/dart): drop currency pipe workaround (angular#2804) Fixes angular#1898
1 parent ebb4297 commit dcf96d1

File tree

102 files changed

+334
-313
lines changed

Some content is hidden

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

102 files changed

+334
-313
lines changed

public/_includes/_util-fns.jade

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,15 @@
3737

3838
//- Location of sample code
3939
- var _liveLink = 'live link';
40+
- var _ngRepoURL = 'https://github.com/angular/angular';
41+
- var _ngDocRepoURL = 'https://github.com/angular/angular.io';
4042

4143
//- NgModule related
4244
- var _AppModuleVsAppComp = 'AppModule'
4345
- var _appModuleTsVsAppCompTs = 'app/app.module.ts'
4446
- var _appModuleTsVsMainTs = 'app/app.module.ts'
4547
- var _bootstrapModule = 'bootstrapModule'
48+
- var _declsVsDirectives = 'declarations'
4649
- var _moduleVsComp = 'module'
4750
- var _moduleVsRootComp = 'module'
4851
- var _platformBrowserDynamicVsBootStrap = 'platformBrowserDynamic'

public/docs/_examples/architecture/dart/lib/sales_tax_component.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ import 'tax_rate_service.dart';
1111
1212
<div *ngIf="amountBox.value != ''">
1313
The sales tax is
14-
{{ getTax(amountBox.value) | currency:'USD':false:'1.2-2' }}
15-
<!-- would like to write currency:'USD':true:'1.2-2' but
16-
currency as symbol is not currently supported; see
17-
https://github.com/dart-lang/intl/issues/59 -->
14+
{{ getTax(amountBox.value) | currency:'USD':true:'1.2-2' }}
1815
</div>
1916
''',
2017
providers: const [SalesTaxService, TaxRateService])

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ environment:
66
sdk: '>=1.19.0 <2.0.0'
77
dependencies:
88
angular2: ^2.0.0
9+
dev_dependencies:
910
browser: ^0.10.0
1011
dart_to_js_script_rewriter: ^1.0.1
1112
transformers:

public/docs/_examples/architecture/e2e-spec.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ function salesTaxTests() {
7171
it('shows sales tax', async function () {
7272
let page = getPageElts();
7373
page.salesTaxAmountInput.sendKeys('10', protractor.Key.ENTER);
74-
// Note: due to Dart bug USD is shown instead of $
75-
let re = /The sales tax is (\$|USD)1.00/;
76-
expect(page.salesTaxDetail.getText()).toMatch(re);
74+
expect(page.salesTaxDetail.getText()).toEqual('The sales tax is $1.00');
7775
});
7876
}
7977

public/docs/_examples/attribute-directives/dart/pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ environment:
66
sdk: '>=1.19.0 <2.0.0'
77
dependencies:
88
angular2: ^2.0.0
9+
dev_dependencies:
910
browser: ^0.10.0
1011
dart_to_js_script_rewriter: ^1.0.1
1112
transformers:

public/docs/_examples/component-styles/dart/pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ environment:
66
sdk: '>=1.19.0 <2.0.0'
77
dependencies:
88
angular2: ^2.0.0
9+
dev_dependencies:
910
browser: ^0.10.0
1011
dart_to_js_script_rewriter: ^1.0.1
1112
transformers:

public/docs/_examples/dependency-injection/dart/lib/app_component.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ import 'providers_component.dart';
2222
<button (click)="nextUser()">Next User</button>
2323
<p>
2424
<my-heroes id="authorized" *ngIf="isAuthorized"></my-heroes>
25-
<my-heroes id="unauthorized" *ngIf="!isAuthorized"></my-heroes>''',
25+
<my-heroes id="unauthorized" *ngIf="!isAuthorized"></my-heroes>
26+
<my-providers></my-providers>
27+
''',
2628
directives: const [
2729
CarComponent,
2830
HeroesComponent,

public/docs/_examples/dependency-injection/dart/lib/providers_component.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,11 @@ class Provider9Component implements OnInit {
224224

225225
// Sample providers 1 to 7 illustrate a required logger dependency.
226226
// Optional logger, can be null.
227-
@Component(selector: 'provider-10', template: '{{log}}')
227+
@Component(
228+
selector: 'provider-10',
229+
template: '{{log}}',
230+
providers: const [const Provider(Logger, useValue: null)]
231+
)
228232
class Provider10Component implements OnInit {
229233
final Logger _logger;
230234
String log;

public/docs/_examples/dependency-injection/dart/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ environment:
66
sdk: '>=1.19.0 <2.0.0'
77
dependencies:
88
angular2: ^2.0.0
9+
dev_dependencies:
910
browser: ^0.10.0
1011
dart_to_js_script_rewriter: ^1.0.1
12+
test: any
1113
transformers:
1214
- angular2:
1315
platform_directives:
@@ -16,5 +18,3 @@ transformers:
1618
- 'package:angular2/common.dart#COMMON_PIPES'
1719
entry_points: web/main.dart
1820
- dart_to_js_script_rewriter
19-
dev_dependencies:
20-
test: any

public/docs/_examples/dependency-injection/dart/web/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@
1010
</head>
1111
<body>
1212
<my-app>Loading...</my-app>
13-
<my-providers>Loading my-providers ...</my-providers>
1413
</body>
1514
</html>

0 commit comments

Comments
 (0)