From 2dcddcfb4a9b6c3c483b3548e2b7f7e49b467304 Mon Sep 17 00:00:00 2001 From: Pascal Precht Date: Sun, 15 Feb 2015 19:57:09 +0100 Subject: [PATCH] docs(templates/directives): fixes several typos Closes #674 --- modules/angular2/docs/core/01_templates.md | 8 -------- modules/angular2/docs/core/02_directives.md | 10 +++++----- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/modules/angular2/docs/core/01_templates.md b/modules/angular2/docs/core/01_templates.md index 42dc5aacb2..3575e0efc1 100644 --- a/modules/angular2/docs/core/01_templates.md +++ b/modules/angular2/docs/core/01_templates.md @@ -223,11 +223,7 @@ Example: ## Property Binding -<<<<<<< HEAD Binding application model data to the UI is the most common kind of bindings in an Angular application. The bindings -======= -Binding application model data to the UI is the most common type of binding in an Angular application. The bindings ->>>>>>> upstream/pr/666 are always in the form of `property-name` which is assigned an `expression`. The generic form is: @@ -258,11 +254,7 @@ its value. Key points: * The binding is to the element property not the element attribute. -<<<<<<< HEAD * To prevent custom element from accidentally reading the literal `expression` on the title element, the attribute name -======= -* To prevent a custom element from accidentally reading the literal `expression` on the title element, the attribute name ->>>>>>> upstream/pr/666 is escaped. In our case the `title` is escaped to `[title]` through the addition of square brackets `[]`. * A binding value (in this case `user.firstName` will always be an expression, never a string literal) diff --git a/modules/angular2/docs/core/02_directives.md b/modules/angular2/docs/core/02_directives.md index e70bf793c5..79680b0df2 100644 --- a/modules/angular2/docs/core/02_directives.md +++ b/modules/angular2/docs/core/02_directives.md @@ -60,7 +60,7 @@ The simplest kind of directive is a decorator. Directives are usefull for encaps * Multiple decorators can be placed on a single element. * Decorators do not introduce new evaluation context. -* Decorators are registered througt the `@Decorator` meta-data annotation. +* Decorators are registered through the `@Decorator` meta-data annotation. Here is a trivial example of a tooltip decorator. The directive will log a tooltip into the console on every time mouse enters a region: @@ -71,7 +71,7 @@ Here is a trivial example of a tooltip decorator. The directive will log a toolt tooltip: 'text' // - DOM element tooltip property should be }, // mapped to the directive text property. event: { // List which events need to be mapped. - mouseover: 'show' // - Invoke the show() method ever time + mouseover: 'show' // - Invoke the show() method every time } // the mouseover event is fired. }) class Form { // Directive controller class, instantiated @@ -98,7 +98,7 @@ Notice that data binding will work with this decorator with no further effort as ## Components -Component is a directive which uses shadow DOM to create encapsulate visual behavior. Components are tipically used to create UI widgets or to break up the application into smaller components. +Component is a directive which uses shadow DOM to create encapsulate visual behavior. Components are typically used to create UI widgets or to break up the application into smaller components. * Only one component can be present per DOM element. * Component's CSS selectors usually trigger on element names. (Best practice) @@ -264,7 +264,7 @@ Injecting other directives into directives follows a similar mechanism as inject There are five kinds of visibilities: -* (no annotation): Inject a directives only if it is on the current element. +* (no annotation): Inject dependant directives only if they are on the current element. * `@ancestor`: Inject a directive if it is at any element above the current element. * `@parent`: Inject a directive which is direct parent of the current element. * `@child`: Inject a list of direct children which match a given type. (Used with `Query`) @@ -337,4 +337,4 @@ Shadow DOM provides an encapsulation for components, so as a general rule it doe ## Further Reading * [Composition](http://en.wikipedia.org/wiki/Object_composition) -* [Composition over Inheritance](http://en.wikipedia.org/wiki/Composition_over_inheritance) \ No newline at end of file +* [Composition over Inheritance](http://en.wikipedia.org/wiki/Composition_over_inheritance)