From d44b37d685020a12bebfdccfb15fed931e4cb645 Mon Sep 17 00:00:00 2001 From: Jeff Cross Date: Tue, 19 May 2015 12:05:08 -0700 Subject: [PATCH 1/6] fix(guide): remove unused style.css reference from setup.html --- public/docs/js/latest/guide/setup.jade | 1 - 1 file changed, 1 deletion(-) diff --git a/public/docs/js/latest/guide/setup.jade b/public/docs/js/latest/guide/setup.jade index fa46f8ae84..2480e9185e 100644 --- a/public/docs/js/latest/guide/setup.jade +++ b/public/docs/js/latest/guide/setup.jade @@ -44,7 +44,6 @@ <!DOCTYPE html> <html> <head> - <link rel="stylesheet" href="style.css"> <script src="https://jspm.io/system@0.16.js"></script> <script src="https://code.angularjs.org/2.0.0-alpha.22/angular2.dev.js"></script> </head> From 8da8313de8e651c5bb3eeb4bdf71f1e7155b4b48 Mon Sep 17 00:00:00 2001 From: Jeff Cross Date: Tue, 19 May 2015 12:06:40 -0700 Subject: [PATCH 2/6] fix(guide): rename s/it's/its in setup to reflect possessiveness --- public/docs/js/latest/guide/setup.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/docs/js/latest/guide/setup.jade b/public/docs/js/latest/guide/setup.jade index 2480e9185e..9bb2116f34 100644 --- a/public/docs/js/latest/guide/setup.jade +++ b/public/docs/js/latest/guide/setup.jade @@ -142,7 +142,7 @@ p. The root component's job is to give a location in the index.html file where your application will - render through it's element, in this case <my-app>. There is also nothing special about this + render through its element, in this case <my-app>. There is also nothing special about this element name and you can pick it as you like. p. From cb615382b519c08082ccfeb88405e91c52f98dc3 Mon Sep 17 00:00:00 2001 From: Jeff Cross Date: Tue, 19 May 2015 12:07:46 -0700 Subject: [PATCH 3/6] fix(guide): add semicolon to note about element naming --- public/docs/js/latest/guide/setup.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/docs/js/latest/guide/setup.jade b/public/docs/js/latest/guide/setup.jade index 9bb2116f34..a39e6534c5 100644 --- a/public/docs/js/latest/guide/setup.jade +++ b/public/docs/js/latest/guide/setup.jade @@ -143,7 +143,7 @@ p. The root component's job is to give a location in the index.html file where your application will render through its element, in this case <my-app>. There is also nothing special about this - element name and you can pick it as you like. + element name; you can pick it as you like. p. The root component loads the initial template for the application that will load other components to perform From 9827bc7466ee5fc27805fb2fbb0f1a39666d7596 Mon Sep 17 00:00:00 2001 From: Jeff Cross Date: Tue, 19 May 2015 12:21:59 -0700 Subject: [PATCH 4/6] fix(guide): remove directives that aren't yet used from displaying-data --- public/docs/js/latest/guide/displaying-data.jade | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/public/docs/js/latest/guide/displaying-data.jade b/public/docs/js/latest/guide/displaying-data.jade index 90ceffdc4b..a6b0fdec2f 100644 --- a/public/docs/js/latest/guide/displaying-data.jade +++ b/public/docs/js/latest/guide/displaying-data.jade @@ -42,7 +42,7 @@ code-tabs code-pane(language="javascript" name="TypeScript" format="linenums" escape="html"). // TypeScript - import {Component, View, bootstrap, For} from 'angular2/angular2'; + import {Component, View, bootstrap} from 'angular2/angular2'; @Component({ selector: 'display' @@ -50,12 +50,10 @@ @View({ template: ` <p>My name: {{ myName }}</p> - `, - directives: [For] + ` }) class DisplayComponent { myName: string; - names: Array<string>; constructor() { this.myName = "Alice"; @@ -72,8 +70,7 @@ }), new angular.ViewAnnotation({ template: - '<p>My name: {{ myName }}</p>', - directives: [angular.For, angular.If] + '<p>My name: {{ myName }}</p>' }) ]; From 111a2147c1bd705527dfd2fca35fdce192146489 Mon Sep 17 00:00:00 2001 From: Jeff Cross Date: Tue, 19 May 2015 12:32:55 -0700 Subject: [PATCH 5/6] fix(guide): remove html escaping from displaying-data code samples --- public/docs/js/latest/guide/displaying-data.jade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/docs/js/latest/guide/displaying-data.jade b/public/docs/js/latest/guide/displaying-data.jade index a6b0fdec2f..fd69a9b1ba 100644 --- a/public/docs/js/latest/guide/displaying-data.jade +++ b/public/docs/js/latest/guide/displaying-data.jade @@ -40,7 +40,7 @@ p To see this working, create another file, show-properties.ts, and add the following: code-tabs - code-pane(language="javascript" name="TypeScript" format="linenums" escape="html"). + code-pane(language="javascript" name="TypeScript" format="linenums"). // TypeScript import {Component, View, bootstrap} from 'angular2/angular2'; @@ -49,7 +49,7 @@ }) @View({ template: ` - <p>My name: {{ myName }}</p> + <p>My name: {{ myName }}</p> ` }) class DisplayComponent { @@ -59,7 +59,7 @@ this.myName = "Alice"; } } - code-pane(language="javascript" name="ES5" format="linenums" escape="html"). + code-pane(language="javascript" name="ES5" format="linenums"). // ES5 function DisplayComponent() { this.myName = "Alice"; From 1803016cd7cb22a47c387b3a41cf091246ddb863 Mon Sep 17 00:00:00 2001 From: Jeff Cross Date: Tue, 19 May 2015 12:34:38 -0700 Subject: [PATCH 6/6] fix(guide): improve "add line after" wording in displaying-data --- public/docs/js/latest/guide/displaying-data.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/docs/js/latest/guide/displaying-data.jade b/public/docs/js/latest/guide/displaying-data.jade index fd69a9b1ba..b249074f4f 100644 --- a/public/docs/js/latest/guide/displaying-data.jade +++ b/public/docs/js/latest/guide/displaying-data.jade @@ -103,12 +103,12 @@ While you've used template: to specify an inline view, for larger templates you'd want to move them to a separate file and load them with templateUrl: instead. - p So you can see Angular dynamically update content, add a line after + p To see Angular dynamically update content, add a line after code-example(language="html" escape="html").

My name: {{ myName }}

- p to this: + p add this: pre.prettyprint.lang-html code. <p>Current time: {{ time }}</p>