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

Commit 639ca37

Browse files
wardbellwardbell
committed
docs: update to beta-11
closes #987 also updated lifecycle-hooks/e2e-spec for changed hook calling sequence (not a bug; just a change)
1 parent c325b2b commit 639ca37

File tree

11 files changed

+47
-40
lines changed

11 files changed

+47
-40
lines changed

‎public/docs/_examples/cb-component-communication/ts/app/app.component.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<h1 id="top">Component Communication Cookbook</h1>
22

3+
<div style="background: yellow; font-weight:bold; margin: 1em 0; padding: 1em">
4+
Known problem with beta.11 prevents this sample from working properly.
5+
We'll fix it for beta.12.
6+
</div>
7+
38
<a href="#parent-to-child">Pass data from parent to child with input binding ("Heros")</a><br/>
49
<a href="#parent-to-child-setter">Intercept input property changes with a setter ("Master")</a><br/>
510
<a href="#parent-to-child-on-changes">Intercept input property changes with <i>ngOnChanges</i> ("Source code version")</a><br/>

‎public/docs/_examples/homepage-hello-world/ts/index.1.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
<script src="https://code.angularjs.org/tools/system.js"></script>
1616
<script src="https://code.angularjs.org/tools/typescript.js"></script>
17-
<script src="https://code.angularjs.org/2.0.0-beta.9/angular2-polyfills.js"></script>
18-
<script src="https://code.angularjs.org/2.0.0-beta.9/Rx.js"></script>
19-
<script src="https://code.angularjs.org/2.0.0-beta.9/angular2.dev.js"></script>
17+
<script src="https://code.angularjs.org/2.0.0-beta.11/angular2-polyfills.js"></script>
18+
<script src="https://code.angularjs.org/2.0.0-beta.11/Rx.js"></script>
19+
<script src="https://code.angularjs.org/2.0.0-beta.11/angular2.dev.js"></script>
2020

2121
<!-- 2. Configure SystemJS -->
2222
<script>

‎public/docs/_examples/homepage-tabs/ts/index.1.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
<script src="https://code.angularjs.org/tools/system.js"></script>
1717
<script src="https://code.angularjs.org/tools/typescript.js"></script>
18-
<script src="https://code.angularjs.org/2.0.0-beta.9/angular2-polyfills.js"></script>
19-
<script src="https://code.angularjs.org/2.0.0-beta.9/Rx.js"></script>
20-
<script src="https://code.angularjs.org/2.0.0-beta.9/angular2.dev.js"></script>
18+
<script src="https://code.angularjs.org/2.0.0-beta.11/angular2-polyfills.js"></script>
19+
<script src="https://code.angularjs.org/2.0.0-beta.11/Rx.js"></script>
20+
<script src="https://code.angularjs.org/2.0.0-beta.11/angular2.dev.js"></script>
2121

2222
<!-- 2. Configure SystemJS -->
2323
<script>

‎public/docs/_examples/homepage-todo/ts/index.1.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
<script src="https://code.angularjs.org/tools/system.js"></script>
1717
<script src="https://code.angularjs.org/tools/typescript.js"></script>
18-
<script src="https://code.angularjs.org/2.0.0-beta.9/angular2-polyfills.js"></script>
19-
<script src="https://code.angularjs.org/2.0.0-beta.9/Rx.js"></script>
20-
<script src="https://code.angularjs.org/2.0.0-beta.9/angular2.dev.js"></script>
18+
<script src="https://code.angularjs.org/2.0.0-beta.11/angular2-polyfills.js"></script>
19+
<script src="https://code.angularjs.org/2.0.0-beta.11/Rx.js"></script>
20+
<script src="https://code.angularjs.org/2.0.0-beta.11/angular2.dev.js"></script>
2121

2222
<!-- 2. Configure SystemJS -->
2323
<script>

‎public/docs/_examples/lifecycle-hooks/e2e-spec.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,17 @@ describe('Lifecycle hooks', function () {
6464

6565
expect(titleEle.getText()).toContain('Windstorm can sing');
6666
changeLogEles.count().then(function(count) {
67-
expect(count).toBeGreaterThan(3, "should start with at least 4 messages");
67+
// Empirically 5 messages to start
68+
expect(count).toBeGreaterThan(4, "should start with some messages");
6869
logCount = count;
6970
// heroNameInputEle.sendKeys('-foo-').then(function () {
7071
return sendKeys(heroNameInputEle, '-foo-')
7172
}).then(function () {
7273
expect(titleEle.getText()).toContain('Windstorm-foo- can sing');
7374
return changeLogEles.count()
7475
}).then(function (count) {
75-
expect(count).toEqual(logCount + 10, 'should add 10 more messages')
76+
// two more for each keystroke except the 1st
77+
expect(count).toEqual(logCount + 9, 'should add 9 more messages')
7678
logCount = count;
7779
// return powerInputEle.sendKeys('-bar-');
7880
return sendKeys(powerInputEle, '-bar-');
@@ -103,7 +105,7 @@ describe('Lifecycle hooks', function () {
103105
expect(commentEle.getText()).toContain('long name');
104106
return logEles.count();
105107
}).then(function(count) {
106-
expect(logCount + 11).toEqual(count, "11 additional log messages should have been added");
108+
expect(logCount + 10).toEqual(count, "10 additional log messages should have been added");
107109
logCount = count;
108110
return buttonEle.click();
109111
}).then(function() {
@@ -132,7 +134,7 @@ describe('Lifecycle hooks', function () {
132134
expect(commentEle.getText()).toContain('long name');
133135
return logEles.count();
134136
}).then(function(count) {
135-
expect(logCount + 11).toEqual(count, "11 additional log messages should have been added");
137+
expect(logCount + 10).toEqual(count, "10 additional log messages should have been added");
136138
logCount = count;
137139
return buttonEle.click();
138140
}).then(function() {

‎public/docs/_examples/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,32 @@
1919
"author": "",
2020
"license": "ISC",
2121
"dependencies": {
22-
"angular2": "2.0.0-beta.9",
22+
"angular2": "2.0.0-beta.11",
2323
"systemjs": "0.19.24",
2424
"es6-promise": "^3.0.2",
2525
"es6-shim": "^0.35.0",
2626
"reflect-metadata": "0.1.2",
2727
"rxjs": "5.0.0-beta.2",
28-
"zone.js": "0.5.15",
28+
"zone.js": "0.6.4",
2929

30-
"a2-in-memory-web-api": "^0.1.9",
30+
"a2-in-memory-web-api": "^0.1.11",
3131
"bootstrap": "^3.3.6"
3232

3333
},
3434
"devDependencies": {
3535
"concurrently": "^2.0.0",
3636
"lite-server": "^2.1.0",
37-
"typescript": "^1.8.7",
38-
"typings":"^0.7.5",
37+
"typescript": "^1.8.9",
38+
"typings":"^0.7.9",
3939

4040
"http-server": "^0.9.0",
4141
"jasmine-core": "~2.4.1",
4242
"karma": "^0.13.22",
4343
"karma-chrome-launcher": "^0.2.2",
4444
"karma-cli": "^0.1.2",
45-
"karma-jasmine": "^0.3.7",
45+
"karma-jasmine": "^0.3.8",
4646
"live-server": "^0.9.2",
47-
"protractor": "^3.1.1",
47+
"protractor": "^3.2.1",
4848
"rimraf": "^2.5.2"
4949
},
5050
"repository": { }

‎public/docs/_examples/quickstart/js/package.1.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
},
88
"license": "ISC",
99
"dependencies": {
10-
"angular2": "2.0.0-beta.9",
10+
"angular2": "2.0.0-beta.11",
1111
"es6-promise": "^3.0.2",
1212
"es6-shim": "^0.35.0",
1313
"reflect-metadata": "0.1.2",
1414
"rxjs": "5.0.0-beta.2",
15-
"zone.js": "0.5.15"
15+
"zone.js": "0.6.4"
1616
},
1717
"devDependencies": {
1818
"concurrently": "^2.0.0",

‎public/docs/_examples/quickstart/ts/package.1.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
},
1212
"license": "ISC",
1313
"dependencies": {
14-
"angular2": "2.0.0-beta.9",
14+
"angular2": "2.0.0-beta.11",
1515
"systemjs": "0.19.24",
1616
"es6-promise": "^3.0.2",
1717
"es6-shim": "^0.35.0",
1818
"reflect-metadata": "0.1.2",
1919
"rxjs": "5.0.0-beta.2",
20-
"zone.js": "0.5.15"
20+
"zone.js": "0.6.4"
2121
},
2222
"devDependencies": {
2323
"concurrently": "^2.0.0",
2424
"lite-server": "^2.1.0",
25-
"typescript": "^1.8.7",
26-
"typings":"^0.7.5"
25+
"typescript": "^1.8.9",
26+
"typings":"^0.7.9"
2727
}
2828
}

‎public/docs/_examples/quickstart/ts/typings.1.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ambientDependencies": {
3-
"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
4-
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#d594ef506d1efe2fea15f8f39099d19b39436b71"
3+
"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#7de6c3dd94feaeb21f20054b9f30d5dabc5efabd",
4+
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#7de6c3dd94feaeb21f20054b9f30d5dabc5efabd"
55
}
66
}

‎public/docs/_examples/typings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ambientDependencies": {
3-
"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
4-
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#d594ef506d1efe2fea15f8f39099d19b39436b71"
3+
"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#7de6c3dd94feaeb21f20054b9f30d5dabc5efabd",
4+
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#7de6c3dd94feaeb21f20054b9f30d5dabc5efabd"
55
}
66
}

0 commit comments

Comments
 (0)