chore(rebase): Rebase latest

Author: Urigo

gulpfile.js

@@ -46,7 +46,7 @@ var LIVE_EXAMPLES_PATH = path.join(RESOURCES_PATH, 'live-examples');
 var STYLES_SOURCE_PATH = path.join(TOOLS_PATH, 'styles-builder/less');
 
 var docShredder = require(path.resolve(TOOLS_PATH, 'doc-shredder/doc-shredder'));
-var ExampleZipper = require(path.resolve(TOOLS_PATH, 'example-zipper/exampleZipper'));
+var exampleZipper = require(path.resolve(TOOLS_PATH, '_example-zipper/exampleZipper'));
 var regularPlunker = require(path.resolve(TOOLS_PATH, 'plunker-builder/regularPlunker'));
 var embeddedPlunker = require(path.resolve(TOOLS_PATH, 'plunker-builder/embeddedPlunker'));
 var fsUtils = require(path.resolve(TOOLS_PATH, 'fs-utils/fsUtils'));
@@ -86,7 +86,6 @@ var _excludeMatchers = _excludePatterns.map(function(excludePattern){
 var _exampleBoilerplateFiles = [
   'src/styles.css',
   'src/systemjs.config.js',
-  'src/systemjs-angular-loader.js',
   'src/tsconfig.json',
   'bs-config.json',
   'bs-config.e2e.json',
@@ -573,7 +572,9 @@ gulp.task('build-and-serve', ['build-docs'], function (cb) {
   watchAndSync({localFiles: true}, cb);
 });
 
-gulp.task('build-docs', ['build-devguide-docs', 'build-api-docs', 'build-plunkers', '_zip-examples']);
+gulp.task('build-docs', ['build-devguide-docs', 'build-api-docs', 'build-plunkers']);
+// Stop zipping examples Feb 28, 2016
+//gulp.task('build-docs', ['build-devguide-docs', 'build-api-docs', 'build-plunkers', '_zip-examples']);
 
 gulp.task('build-api-docs', ['build-js-api-docs', 'build-ts-api-docs']);
 
@@ -786,8 +787,8 @@ gulp.task('_shred-clean-api', function(cb) {
 });
 
 gulp.task('_zip-examples', function() {
-  new ExampleZipper(_devguideShredOptions.examplesDir, _devguideShredOptions.zipDir);
-  // exampleZipper.zipExamples(_apiShredOptions.examplesDir, _apiShredOptions.zipDir);
+  exampleZipper.zipExamples(_devguideShredOptions.examplesDir, _devguideShredOptions.zipDir);
+  exampleZipper.zipExamples(_apiShredOptions.examplesDir, _apiShredOptions.zipDir);
 });
 
 

public/_data.json

@@ -15,6 +15,10 @@
     "autoformat": "true"
   },
 
+  "news": {
+    "title": "News"
+  },
+
   "events": {
     "title": "Events",
     "subtitle": "Where we'll be presenting"

public/_includes/_footer.jade

@@ -41,7 +41,7 @@ div(class="main-footer" data-swiftype-index="false")
       ul.text-body
         li <a href="/events.html">Events</a>
         li <a href="http://www.meetup.com/topics/angularjs/">Meetups</a>
-        li <a href="https://twitter.com/angular"> Twitter</a>
+        li <a href="https://twitter.com/angularjs"> Twitter</a>
         li <a href="https://github.com/angular/angular"> GitHub</a>
         li <a href="/contribute.html"> Contribute</a>
 

public/_includes/_main-nav.jade

@@ -10,4 +10,5 @@ nav(data-swiftype-index="false" class="main-nav l-pinned-top l-layer-5", scroll-
     li.l-left <a class="main-nav-button" href="/features.html" md-button>Features</a>
     li.l-left <a class="main-nav-button" href="/docs/#{language}/latest/" md-button>Docs</a>
     li.l-left <a class="main-nav-button" href="/events.html" md-button>Events</a>
+    li.l-left <a class="main-nav-button" href="/news.html" md-button>News</a>
     li.l-right <a class="main-nav-button" href="/docs/ts/latest/quickstart.html" md-button>Get Started</a>

public/docs/_examples/.gitignore

@@ -1,7 +1,6 @@
 # _boilerplate files
 !_boilerplate/*
 */*/src/styles.css
-*/*/src/systemjs-angular-loader.js
 */*/src/systemjs.config.js
 */*/src/tsconfig.json
 */*/bs-config.e2e.json

public/docs/_examples/_boilerplate/package.json

@@ -38,7 +38,7 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "angular-cli": "^1.0.0-rc.0"
+    "angular-cli": "^1.0.0-beta.26"
   },
   "repository": {}
 }

public/docs/_examples/_boilerplate/src/systemjs-angular-loader.js

@@ -11,7 +11,7 @@
     // map tells the System loader where to look for things
     map: {
       // our app is within the app folder
-      'app': 'app',
+      app: 'app',
 
       // angular bundles
       '@angular/core': 'npm:@angular/core/bundles/core.umd.js',
@@ -32,12 +32,7 @@
     packages: {
       app: {
         main: './main.js',
-        defaultExtension: 'js',
-        meta: {
-          './*.js': {
-            loader: 'systemjs-angular-loader.js'
-          }
-        }
+        defaultExtension: 'js'
       },
       rxjs: {
         defaultExtension: 'js'

public/docs/_examples/_boilerplate/src/systemjs.config.js

@@ -34,9 +34,8 @@
     },
     // map tells the System loader where to look for things
     map: {
-      'ng-loader': './systemjs-angular-loader.js',
       // our app is within the app folder
-      'app': 'app',
+      app: 'app',
 
       // angular bundles
       '@angular/core': 'ng:core-builds/master/bundles/core.umd.js',
@@ -72,12 +71,7 @@
     packages: {
       app: {
         main: './main.ts',
-        defaultExtension: 'ts',
-        meta: {
-          './*.ts': {
-            loader: 'ng-loader'
-          }
-        }
+        defaultExtension: 'ts'
       },
       rxjs: {
         defaultExtension: 'js'

public/docs/_examples/_boilerplate/src/systemjs.config.web.build.js

@@ -31,9 +31,8 @@
     },
     // map tells the System loader where to look for things
     map: {
-      'ng-loader': './systemjs-angular-loader.js',
       // our app is within the app folder
-      'app': 'app',
+      app: 'app',
 
       // angular bundles
       '@angular/core': 'npm:@angular/core/bundles/core.umd.js',
@@ -59,12 +58,7 @@
     packages: {
       app: {
         main: './main.ts',
-        defaultExtension: 'ts',
-        meta: {
-          './*.ts': {
-            loader: 'ng-loader'
-          }
-        }
+        defaultExtension: 'ts'
       },
       rxjs: {
         defaultExtension: 'js'

public/docs/_examples/_boilerplate/src/systemjs.config.web.js

@@ -11,6 +11,7 @@ import {
 import { Heroes } from './hero.service';
 
 @Component({
+  moduleId: module.id,
   selector: 'hero-list-auto',
   // #docregion template
   template: `

public/docs/_examples/animations/ts/src/app/hero-list-auto.component.ts

@@ -15,6 +15,7 @@ import {
 import { Heroes } from './hero.service';
 
 @Component({
+  moduleId: module.id,
   selector: 'hero-list-basic',
   // #enddocregion
   /* The click event calls hero.toggleState(), which

public/docs/_examples/animations/ts/src/app/hero-list-basic.component.ts

@@ -14,6 +14,7 @@ import {
 import { Heroes } from './hero.service';
 
 @Component({
+ moduleId: module.id,
  selector: 'hero-list-combined-transitions',
  // #docregion template
  template: `

public/docs/_examples/animations/ts/src/app/hero-list-combined-transitions.component.ts

@@ -11,6 +11,7 @@ import {
 import { Heroes } from './hero.service';
 
 @Component({
+  moduleId: module.id,
   selector: 'hero-list-enter-leave-states',
   // #docregion template
   template: `

public/docs/_examples/animations/ts/src/app/hero-list-enter-leave-states.component.ts

@@ -11,6 +11,7 @@ import {
 import { Heroes } from './hero.service';
 
 @Component({
+  moduleId: module.id,
   selector: 'hero-list-enter-leave',
   // #docregion template
   template: `

public/docs/_examples/animations/ts/src/app/hero-list-enter-leave.component.ts

@@ -12,6 +12,7 @@ import {
 import { Heroes } from './hero.service';
 
 @Component({
+  moduleId: module.id,
   selector: 'hero-list-groups',
   template: `
     <ul>

public/docs/_examples/animations/ts/src/app/hero-list-groups.component.ts

@@ -13,6 +13,7 @@ import {
 import { Heroes } from './hero.service';
 
 @Component({
+ moduleId: module.id,
  selector: 'hero-list-inline-styles',
  // #docregion template
  template: `

public/docs/_examples/animations/ts/src/app/hero-list-inline-styles.component.ts

@@ -13,6 +13,7 @@ import {
 import { Heroes } from './hero.service';
 
 @Component({
+  moduleId: module.id,
   selector: 'hero-list-multistep',
   // #docregion template
   template: `

public/docs/_examples/animations/ts/src/app/hero-list-multistep.component.ts

@@ -11,6 +11,7 @@ import {
 import { Heroes } from './hero.service';
 
 @Component({
+  moduleId: module.id,
   selector: 'hero-list-timings',
   template: `
     <ul>

public/docs/_examples/animations/ts/src/app/hero-list-timings.component.ts

@@ -14,6 +14,7 @@ import {
 import { Heroes } from './hero.service';
 
 @Component({
+ moduleId: module.id,
  selector: 'hero-list-twoway',
  // #docregion template
  template: `

public/docs/_examples/animations/ts/src/app/hero-list-twoway.component.ts

@@ -3,6 +3,7 @@ import { Component, Input } from '@angular/core';
 import { Hero } from './hero';
 
 @Component({
+  moduleId: module.id,
   selector: 'hero-detail',
   templateUrl: './hero-detail.component.html'
 })

public/docs/_examples/architecture/ts/src/app/hero-detail.component.ts

@@ -5,6 +5,7 @@ import { HeroService }         from './hero.service';
 
 // #docregion metadata, providers
 @Component({
+  moduleId: module.id,
   selector:    'hero-list',
   templateUrl: './hero-list.component.html',
   providers:  [ HeroService ]

public/docs/_examples/architecture/ts/src/app/hero-list.component.ts

@@ -15,7 +15,7 @@ describe('Attribute directives', function () {
   });
 
   it('should be able to select green highlight', function () {
-    let highlightedEle = element(by.cssContainingText('p', 'Highlight me!'));
+    let highlightedEle = element(by.cssContainingText('p', 'Highlight me'));
     let lightGreen = 'rgba(144, 238, 144, 1)';
 
     expect(highlightedEle.getCssValue('background-color')).not.toEqual(lightGreen);

public/docs/_examples/attribute-directives/e2e-spec.ts

@@ -1,14 +1,18 @@
 <!-- #docregion -->
 <h1>My First Attribute Directive</h1>
-<!-- #docregion applied -->
 <p myHighlight>Highlight me!</p>
-<!-- #enddocregion applied,  -->
+<!-- #enddocregion -->
 
 <!-- #docregion color-1 -->
 <p myHighlight highlightColor="yellow">Highlighted in yellow</p>
 <p myHighlight [highlightColor]="'orange'">Highlighted in orange</p>
+
 <!-- #enddocregion color-1 -->
 
 <!-- #docregion color-2 -->
 <p myHighlight [highlightColor]="color">Highlighted with parent component's color</p>
 <!-- #enddocregion color-2 -->
+
+<!-- #docregion p-style-background -->
+<p [style.background]="'lime'">I am green with envy!</p>
+<!-- #enddocregion p-style-background -->

public/docs/_examples/attribute-directives/ts/src/app/app.component.1.html

@@ -1,10 +1,12 @@
 import { Component } from '@angular/core';
 
 @Component({
+  moduleId: module.id,
   selector: 'my-app',
   templateUrl: './app.component.1.html'
 })
 // #docregion class
 export class AppComponent {
   color = 'yellow';
 }
+// #enddocregion class

public/docs/_examples/attribute-directives/ts/src/app/app.component.1.ts

@@ -1,4 +1,5 @@
-<!-- #docregion v2, -->
+<!-- #docregion -->
+<!-- #docregion v2 -->
 <h1>My First Attribute Directive</h1>
 
 <h4>Pick a highlight color</h4>
@@ -9,13 +10,15 @@ <h4>Pick a highlight color</h4>
 </div>
 <!-- #docregion color -->
 <p [myHighlight]="color">Highlight me!</p>
-<!-- #enddocregion color, v2 -->
+<!-- #enddocregion color -->
+<!-- #enddocregion v2 -->
 
 <!-- #docregion defaultColor -->
 <p [myHighlight]="color" defaultColor="violet">
   Highlight me too!
 </p>
-<!-- #enddocregion defaultColor, -->
+<!-- #enddocregion defaultColor -->
+<!-- #enddocregion -->
 
 <hr>
 <p><i>Mouse over the following lines to see fixed highlights</i></p>

public/docs/_examples/attribute-directives/ts/src/app/app.component.html

@@ -2,10 +2,13 @@
 import { Component } from '@angular/core';
 
 @Component({
+  moduleId: module.id,
   selector: 'my-app',
   templateUrl: './app.component.html'
 })
 // #docregion class
 export class AppComponent {
   color: string;
 }
+// #enddocregion class
+// #enddocregion