Merge branch 'master' of https://github.com/IdeaBlade/angular.io

Author: kapunahelewong

.eslintrc.js

@@ -0,0 +1,30 @@
+module.exports = {
+    "globals": {
+        "describe": true,
+        "beforeEach": true,
+        "it": true,
+        "expect": true
+    },
+    "env": {
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "indent": [
+            "error",
+            2
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ]
+    }
+};

.nvmrc

@@ -1 +1 @@
-5
+6

.travis.yml

@@ -2,7 +2,7 @@ dist: trusty
 sudo: required
 language: node_js
 node_js:
-  - "5"
+  - "6"
 os:
   - linux
 env:

README.md

@@ -21,6 +21,8 @@ Filing issues is helpful but **pull requests** that improve the docs are even be
 
 Learn how to [contribute to Angular.io](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md).
 
+> **IMPORTANT**: Do _NOT_ make changes to cached files under `public/docs/ts/_cache`. Cached files are updated through a separate workflow.
+
 ## Development Setup
 This site relies heavily on node and npm.
 

package.json

@@ -36,11 +36,10 @@
     "cross-spawn": "^4.0.0",
     "del": "^2.2.0",
     "dgeni": "^0.4.0",
-    "dgeni-packages": "^0.13.1",
+    "dgeni-packages": "^0.15.2",
     "diff": "^2.1.3",
     "fs-extra": "^0.30.0",
     "globby": "^4.0.0",
-    "grunt-sass": "^1.2.0",
     "gulp": "^3.5.6",
     "gulp-env": "0.4.0",
     "gulp-sass": "^2.3.2",
@@ -49,7 +48,7 @@
     "gulp-tslint": "^5.0.0",
     "gulp-util": "^3.0.6",
     "gulp-watch": "^4.3.4",
-    "harp": "^0.20.3",
+    "harp": "0.21.0-pre.0",
     "html2jade": "^0.8.4",
     "indent-string": "^2.1.0",
     "jasmine-core": "^2.3.4",

public/docs/_examples/lifecycle-hooks/dart/lib/do_check_component.dart

@@ -1,6 +1,4 @@
 // #docregion
-import 'dart:convert';
-
 import 'package:angular2/core.dart';
 
 class Hero {
@@ -23,7 +21,7 @@ class Hero {
       '.hero {background: LightYellow; padding: 8px; margin-top: 8px}',
       'p {background: Yellow; padding: 8px; margin-top: 8px}'
     ])
-class DoCheckComponent implements DoCheck, OnChanges {
+class DoCheckComponent implements DoCheck {
   @Input()
   Hero hero;
   @Input()
@@ -72,16 +70,6 @@ class DoCheckComponent implements DoCheck, OnChanges {
   }
   // #enddocregion ng-do-check
 
-  // Copied from OnChangesComponent
-  ngOnChanges(Map<String, SimpleChange> changes) {
-    changes.forEach((String propName, SimpleChange change) {
-      String cur = JSON.encode(change.currentValue);
-      String prev =
-          change.isFirstChange() ? "{}" : JSON.encode(change.previousValue);
-      changeLog.add('$propName: currentValue = $cur, previousValue = $prev');
-    });
-  }
-
   void reset() {
     changeDetected = true;
     changeLog.clear();

public/docs/_examples/quickstart/ts/index.html

@@ -9,10 +9,10 @@
 
     <!-- 1. Load libraries -->
     <!-- #docregion libraries -->
-    <!-- #docregion ie-polyfills -->
+    <!-- #docregion polyfills -->
      <!-- Polyfill(s) for older browsers -->
     <script src="node_modules/core-js/client/shim.min.js"></script>
-    <!-- #enddocregion ie-polyfills -->
+    <!-- #enddocregion polyfills -->
 
     <script src="node_modules/zone.js/dist/zone.js"></script>
     <script src="node_modules/reflect-metadata/Reflect.js"></script>

public/docs/dart/latest/_data.json

@@ -38,7 +38,7 @@
 
   "cheatsheet": {
     "title": "Angular Cheat Sheet",
-    "intro": "A quick guide to Angular syntax.",
+    "intro": "A quick guide to Angular syntax. (Content is provisional and may change.)",
     "reference": false
   },
 

public/docs/dart/latest/cheatsheet.jade

@@ -1,9 +1,4 @@
 - var base = current.path[4] ? '.' : './guide';
-.banner.grid-fluid
-  .alert.is-important
-    :marked
-      This cheat sheet is provisional and subject to change.
 
-article(class="l-content-small grid-fluid docs-content")
-  .cheatsheet
-    ngio-cheatsheet(src= base + '/cheatsheet.json')
+.l-content-small.grid-fluid.docs-content.cheatsheet
+  ngio-cheatsheet(src= base + '/cheatsheet.json')

public/docs/dart/latest/guide/_data.json

@@ -59,7 +59,7 @@
 
   "cheatsheet": {
     "title": "Angular Cheat Sheet",
-    "intro": "A quick guide to Angular syntax.",
+    "intro": "A quick guide to Angular syntax. (Content is provisional and may change.)",
     "nextable": true,
     "basics": true
   },
@@ -87,6 +87,11 @@
     "intro": "Attribute directives attach behavior to elements."
   },
 
+  "browser-support": {
+    "title": "Browser support",
+    "intro": "Browser support and polyfills guide."
+  },
+
   "component-styles": {
     "title": "Component Styles",
     "intro": "Learn how to apply CSS styles to components."

public/docs/dart/latest/guide/browser-support.jade

@@ -0,0 +1 @@
+!= partial("../../../_includes/_ts-temp")

public/docs/dart/latest/guide/cheatsheet.jade

@@ -1 +1 @@
-!= partial("../cheatsheet")
+extends ../cheatsheet

public/docs/js/latest/_data.json

@@ -38,7 +38,7 @@
 
   "cheatsheet": {
     "title": "Angular Cheat Sheet",
-    "intro": "A quick guide to Angular syntax.",
+    "intro": "A quick guide to Angular syntax. (Content is provisional and may change.)",
     "reference": false
   },
 

public/docs/js/latest/cheatsheet.jade

@@ -1,5 +1,4 @@
 - var base = current.path[4] ? '.' : './guide';
 
-article(class="l-content-small grid-fluid docs-content")
-  .cheatsheet
-    ngio-cheatsheet(src= base + '/cheatsheet.json')
+.l-content-small.grid-fluid.docs-content.cheatsheet
+  ngio-cheatsheet(src= base + '/cheatsheet.json')

public/docs/js/latest/guide/_data.json

@@ -52,7 +52,7 @@
 
   "cheatsheet": {
     "title": "Angular Cheat Sheet",
-    "intro": "A quick guide to Angular syntax.",
+    "intro": "A quick guide to Angular syntax. (Content is provisional and may change.)",
     "nextable": true,
     "basics": true
   },
@@ -74,6 +74,11 @@
     "intro": "Attribute directives attach behavior to elements."
   },
 
+  "browser-support": {
+    "title": "Browser support",
+    "intro": "Browser support and polyfills guide."
+  },
+
   "component-styles": {
     "title": "Component Styles",
     "intro": "Learn how to apply CSS styles to components."

public/docs/js/latest/guide/browser-support.jade

@@ -0,0 +1 @@
+!= partial("../../../_includes/_ts-temp")

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

@@ -1 +1 @@
-!= partial("../cheatsheet")
+extends ../cheatsheet

public/docs/ts/latest/_data.json

@@ -45,7 +45,7 @@
 
   "cheatsheet": {
     "title": "Angular Cheat Sheet",
-    "intro": "A quick guide to Angular syntax.",
+    "intro": "A quick guide to Angular syntax. (Content is provisional and may change.)",
     "reference": false
   },
 

public/docs/ts/latest/cheatsheet.jade

@@ -1,7 +1,4 @@
 - var base = current.path[4] ? '.' : './guide';
-.banner
-  p.text-body This cheat sheet is provisional and may change. Angular 2 is currently in Release Candidate.
 
-article(class="l-content-small grid-fluid docs-content")
-  .cheatsheet
-    ngio-cheatsheet(src= base + '/cheatsheet.json')
+.l-content-small.grid-fluid.docs-content.cheatsheet
+  ngio-cheatsheet(src= base + '/cheatsheet.json')

public/docs/ts/latest/guide/_data.json

@@ -60,7 +60,7 @@
 
   "cheatsheet": {
     "title": "Angular Cheat Sheet",
-    "intro": "A quick guide to Angular syntax.",
+    "intro": "A quick guide to Angular syntax. (Content is provisional and may change.)",
     "nextable": true,
     "basics": true
   },
@@ -86,6 +86,11 @@
     "intro": "Attribute directives attach behavior to elements."
   },
 
+  "browser-support": {
+    "title": "Browser support",
+    "intro": "Browser support and polyfills guide."
+  },
+
   "component-styles": {
     "title": "Component Styles",
     "intro": "Learn how to apply CSS styles to components."