8000 Merge pull request #125 from jeffbcross/fixes-one · rusongyu/angular.io@4a4a8d6 · GitHub
[go: up one dir, main page]

Skip to content

Commit 4a4a8d6

Browse files
author
Alex Wolfe
committed
Merge pull request angular#125 from jeffbcross/fixes-one
First round of guide content fixes
2 parents 6ef6448 + 1803016 commit 4a4a8d6

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

public/docs/js/latest/guide/displaying-data.jade

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,26 @@
4040
p To see this working, create another file, <code>show-properties.ts</code>, and add the following:
4141

4242
code-tabs
43-
code-pane(language="javascript" name="TypeScript" format="linenums" escape="html").
43+
code-pane(language="javascript" name="TypeScript" format="linenums").
4444
// TypeScript
45-
import {Component, View, bootstrap, For} from 'angular2/angular2';
45+
import {Component, View, bootstrap} from 'angular2/angular2';
4646

4747
@Component({
4848
selector: 'display'
4949
})
5050
@View({
5151
template: `
52-
&lt;p&gt;My name: {{ myName }}&lt;/p&gt
53-
`,
54-
directives: [For]
52+
&lt;p&gt;My name: {{ myName }}&lt;/p&gt;
53+
`
5554
})
5655
class DisplayComponent {
5756
myName: string;
58-
names: Array&lt;string&gt;;
5957

6058
constructor() {
6159
this.myName = "Alice";
6260
}
6361
}
64-
code-pane(language="javascript" name="ES5" format="linenums" escape="html").
62+
code-pane(language="javascript" name="ES5" format="linenums").
6563
// ES5
6664
function DisplayComponent() {
6765
this.myName = "Alice";
@@ -72,8 +70,7 @@
7270
}),
7371
new angular.ViewAnnotation({
7472
template:
75-
'&lt;p&gt;My name: {{ myName }}&lt;/p&gt;',
76-
directives: [angular.For, angular.If]
73+
'&lt;p&gt;My name: {{ myName }}&lt;/p&gt;'
7774
})
7875
];
7976

@@ -106,12 +103,12 @@
106103
While you've used <code>template:</code> to specify an inline view, for larger templates you'd
107104
want to move them to a separate file and load them with <code>templateUrl:</code> instead.
108105

109-
p So you can see Angular dynamically update content, add a line after
106+
p To see Angular dynamically update content, add a line after
110107

111108
code-example(language="html" escape="html").
112109
<p>My name: {{ myName }}</p>
113110

114-
p to this:
111+
p add this:
115112
pre.prettyprint.lang-html
116113
code.
117114
&lt;p&gt;Current time: {{ time }}&lt;/p&gt;

public/docs/js/latest/guide/setup.jade

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
&lt;!DOCTYPE html&gt;
4545
&lt;html&gt;
4646
&lt;head&gt;
47-
&lt;link rel=&quot;stylesheet&quot; href=&quot;style.css&quot;&gt;
4847
&lt;script src=&quot;https://jspm.io/system@0.16.js&quot;&gt;&lt;/script&gt;
4948
&lt;script src=&quot;https://code.angularjs.org/2.0.0-alpha.22/angular2.dev.js&quot;&gt;&lt;/script&gt;
5049
&lt;/head&gt;
@@ -143,8 +142,8 @@
143142

144143
p.
145144
The root component's job is to give a location in the <code>index.html</code> file where your application will
146-
render through it's element, in this case <code>&lt;my-app&gt;</code>. There is also nothing special about this
147-
element name and you can pick it as you like.
145+
render through its element, in this case <code>&lt;my-app&gt;</code>. There is also nothing special about this
146+
element name; you can pick it as you like.
148147

149148
p.
150149
The root component loads the initial template for the application that will load other components to perform

0 commit comments

Comments
 (0)
0