Merge remote-tracking branch 'angulario/master'

Author: Foxandxss

gulpfile.js

@@ -441,7 +441,7 @@ gulp.task('add-example-boilerplate', function(done) {
 // copies boilerplate files to locations
 // where an example app is found
 gulp.task('_copy-example-boilerplate', function (done) {
-  if (!argv.fast) buildStyles(copyExampleBoilerplate, done);
+  return argv.fast ? done() : buildStyles(copyExampleBoilerplate, done);
 });
 
 //Builds Angular 2 Docs CSS file from Bootstrap npm LESS source

public/_includes/_util-fns.jade

@@ -98,14 +98,14 @@ mixin makeExample(_filePath, region, _title, stylePatterns)
 //- ending is given or is just (), then the title will be suffixed with
 //- either "(excerpt)", or "(#{_region})" when _region is defined.
 mixin makeExcerpt(_filePath, _region, _title, stylePatterns)
-  - var matches = _filePath.match(/(.*)\s+\(([\w ]*)\)$/);
+  - var matches = _filePath.match(/(.*)\s+\(([^\)]*)\)$/);
   - var parenText;
   - if (matches) { _filePath = matches[1]; parenText = matches[2]; }
   - var adjustments = adjustExamplePathAndTitle({filePath:_filePath, title:_title});
   - var filePath = adjustments.filePath;
   - var title = adjustments.title;
-  - var region = _region || parenText;
-  - var excerpt = !region || parenText === '' ? 'excerpt' : parenText || region;
+  - var region = _region || (_region === '' ? '' : parenText);
+  - var excerpt = parenText || region || 'excerpt';
   - if (title) title = title + ' (' + excerpt + ')';
   +makeExample(filePath, region, title, stylePatterns)(format='.')
 
@@ -222,8 +222,8 @@ script.
 -   // E.g. of a project relative path is 'app/main.ts'
 -   if (ex.title === null || ex.title === undefined) {
 -     // Title is not given so take it to be ex.filePath.
--     // Is title like styles.1.css? Then drop the '.1' qualifier:
--     var matches = ex.filePath.match(/^(.*)\.\d(\.\w+)$/);
+-     // Title like styles.1.css or foo_1.dart? Then drop the '.1' or '_1' qualifier:
+-     var matches = ex.filePath.match(/^(.*)[\._]\d(\.\w+)$/);
 -     ex.title = matches ? matches[1] + matches[2] : ex.filePath;
 -   }
 -   ex.filePath = getExampleName() + '/' + _docsFor + '/' + ex.filePath;

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

@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.18
+  angular2: 2.0.0-beta.20
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:

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

@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.18
+  angular2: 2.0.0-beta.20
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:

public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.module.ts

@@ -2,17 +2,16 @@
 import { NgModule }      from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { FormsModule }   from '@angular/forms';
-import { RouterModule }   from '@angular/router';
 
 import { AppComponent }  from './app.component';
 import { MovieListComponent } from './movie-list.component';
-import { routes } from './app.routes';
+import { routing } from './app.routing';
 
 @NgModule({
   imports: [
     BrowserModule,
     FormsModule,
-    RouterModule.forRoot(routes, {})
+    routing
   ],
   declarations: [
     AppComponent,

public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.routes.ts

@@ -0,0 +1,12 @@
+// #docregion
+import { ModuleWithProviders } from '@angular/core';
+import { Routes, RouterModule }  from '@angular/router';
+
+import { MovieListComponent } from './movie-list.component';
+
+const routes: Routes = [
+  { path: '', redirectTo: '/movies', pathMatch: 'full' },
+  { path: 'movies', component: MovieListComponent }
+];
+
+export const routing: ModuleWithProviders = RouterModule.forRoot(routes);

public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.routing.ts

@@ -1,15 +1,16 @@
 // #docregion
 import { BrowserModule }                from '@angular/platform-browser';
 import { FormsModule }                  from '@angular/forms';
-import { XHRBackend }                   from '@angular/http';
-// import { appRouterProviders }        from './app.routes';
+import { HttpModule }                   from '@angular/http';
+
+/* import { routing }                   from './app.routing';*/
 import { LocationStrategy,
          HashLocationStrategy }         from '@angular/common';
 import { NgModule }                     from '@angular/core';
 
 import { HeroData }                     from './hero-data';
-import { InMemoryBackendService,
-         SEED_DATA }                    from 'angular2-in-memory-web-api';
+import { InMemoryWebApiModule }         from 'angular2-in-memory-web-api';
+
 
 import { AppComponent }                 from './app.component';
 import { HeroBioComponent }             from './hero-bio.component';
@@ -31,44 +32,43 @@ import { ParentFinderComponent,
          BethComponent,
          BobComponent }                 from './parent-finder.component';
 
-const DIRECTIVES = [
+const declarations = [
+    AppComponent,
     HeroBiosComponent, HeroBiosAndContactsComponent, HeroBioComponent,
     HeroesBaseComponent, SortedHeroesComponent,
     HeroOfTheMonthComponent, HeroContactComponent,
     HighlightDirective,
     ParentFinderComponent,
-    AppComponent
 ];
 
-const B_DIRECTIVES = [ BarryComponent, BethComponent, BobComponent ];
+const a_components = [AliceComponent, AlexComponent ];
+
+const b_components = [ BarryComponent, BethComponent, BobComponent ];
 
-// #docregion C_DIRECTIVES
-const C_DIRECTIVES = [
+const c_components = [
   CarolComponent, ChrisComponent, CraigComponent,
   CathyComponent
 ];
-// #enddocregion C_DIRECTIVES
 
-// #docregion bootstrap
 @NgModule({
-  imports: [ BrowserModule, FormsModule ],
-  declarations: [ ...DIRECTIVES,
-                  ...B_DIRECTIVES,
-                  ...C_DIRECTIVES,
-                  AliceComponent,
-                  AlexComponent ],
+  imports: [
+    BrowserModule,
+    FormsModule,
+    HttpModule,
+    InMemoryWebApiModule.forRoot(HeroData)
+    // routing TODO: add routes
+  ],
+  declarations: [
+    declarations,
+    a_components,
+    b_components,
+    c_components,
+  ],
   bootstrap: [ AppComponent ],
+  // #docregion providers
   providers: [
-    // appRouterProviders, TODO: add routes
-    { provide: LocationStrategy, useClass: HashLocationStrategy },
-
-    { provide: XHRBackend, useClass: InMemoryBackendService }, // in-mem server
-    { provide: SEED_DATA,  useClass: HeroData } // in-mem server data
+    { provide: LocationStrategy, useClass: HashLocationStrategy }
   ]
+  // #enddocregion providers
 })
-export class AppModule {
-  constructor() {
-  }
-}
-// #enddocregion bootstraps
-
+export class AppModule { }

public/docs/_examples/cb-dependency-injection/ts/app/app.module.ts

@@ -0,0 +1,10 @@
+import { ModuleWithProviders }   from '@angular/core';
+import { Routes, RouterModule }  from '@angular/router';
+
+const routes: Routes = [];
+
+export const routing: ModuleWithProviders = RouterModule.forRoot(routes);
+
+export const appRoutingProviders: any[] = [
+
+];