Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit de4903b

Browse files
wardbellFoxandxss
authored andcommitted
chore: Angular 1 -> AngularJS / Angular 2 -> Angular (#3143)
* chore: Angular 1 -> AngularJS / Angular 2 -> Angular * Jesus' tweaks
1 parent 969f169 commit de4903b

File tree

81 files changed

+575
-560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+575
-560
lines changed

README.md

Lines changed: 3 additions & 2 deletions

firebase.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@
5757
"source": "/docs/js/latest/tutorial",
5858
"destination": "/docs/js/latest/index.html"
5959
},
60+
{
61+
"source": "/docs/ts/latest/cookbook/a1-a2-quick-reference.html",
62+
"destination": "/docs/ts/latest/cookbook/ajs-quick-reference.html"
63+
},
6064
{
6165
"source": "/docs/ts/latest/guide/setup.html",
6266
"destination": "/docs/ts/latest/index.html"
@@ -109,4 +113,4 @@
109113
"docs/dart/**"
110114
]
111115
}
112-
}
116+
}

harp.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"picture": "/resources/images/bios/jelbourn.jpg",
5757
"twitter": "jelbourn",
5858
"website": "https://plus.google.com/+JeremyElbourn/",
59-
"bio": "Angular Material 2 Team Lead. FE Engineer @ Google specializing in AngularJS, component design, and the cleanest of code.",
59+
"bio": "Angular Material Team Lead. FE Engineer @ Google specializing in AngularJS, component design, and the cleanest of code.",
6060
"type": "Lead"
6161
},
6262

@@ -65,7 +65,7 @@
6565
"picture": "/resources/images/bios/pete.jpg",
6666
"twitter": "petebd",
6767
"website": "http://www.bacondarwin.com",
68-
"bio": "Angular 1 for JS Team Lead. Pete has been working on the core team since 2012 and became the team lead for the Angular 1 for JS branch in November 2014. He has co-authored a book on AngularJS and regularly talks about and teaches Angular.",
68+
"bio": "AngularJS for JS Team Lead. Pete has been working on the core team since 2012 and became the team lead for the AngularJS for JS branch in November 2014. He has co-authored a book on AngularJS and regularly talks about and teaches Angular.",
6969
"type": "Lead"
7070
},
7171

@@ -74,7 +74,7 @@
7474
"picture": "/resources/images/bios/thomas.jpg",
7575
"twitter": "ThomasBurleson",
7676
"website": "http://www.solutionOptimist.com",
77-
"bio": "Angular Material 1.x and @angular/flex-layout Team Lead. Thomas joined the core team in 2014. He leads a team of developers working on UX components for Angular 1.x.",
77+
"bio": "AngularJS Material and @angular/flex-layout Team Lead. Thomas joined the core team in 2014. He leads a team of developers working on UX components for AngularJS.",
7878
"type": "Lead"
7979
},
8080
"stephenfluin": {
@@ -98,7 +98,7 @@
9898
"picture": "/resources/images/bios/xiaofei.jpg",
9999
"twitter": "",
100100
"website": "http://github.com/damoqiongqiu",
101-
"bio": "Aaron is Angular's developer PM in China. He is the lead for angular.cn and social channels in China, and helps developers in China's enterprise and open source communities to be successful with Angular. One of the earliest Angular developers in China since 2012, he translated the first books on Angular into Chinese. Aaron joined the Google team in 2016.",
101+
"bio": "Aaron is Angular's developer PM in China. He is the lead for angular.cn and social channels in China, and helps developers in China's enterprise and open source communities to be successful with Angular. One of the earliest Angular developers in China since Angular 2012, he translated the first books on Angular into Chinese. Aaron joined the Google team in 2016.",
102102
"type": "Google"
103103
},
104104
"tobias": {
@@ -159,7 +159,7 @@
159159
"picture": "/resources/images/bios/alex-rickabaugh.jpg",
160160
"twitter": "synalx",
161161
"website": "https://plus.google.com/+AlexRickabaugh/about",
162-
"bio": "Core team member working to optimize the Angular platform for the next generation of applications, including mobile. Before joining the Angular team, Alex worked in the Google sales organization where he helped build the first large Angular2 application within Google.",
162+
"bio": "Core team member working to optimize the Angular platform for the next generation of applications, including mobile. Before joining the Angular team, Alex worked in the Google sales organization where he helped build the first large Angular application within Google.",
163163
"type": "Google"
164164
},
165165

@@ -195,15 +195,15 @@
195195
"picture": "/resources/images/bios/victor.jpg",
196196
"twitter": "victorsavkin",
197197
"website": "http://victorsavkin.com/",
198-
"bio": "Victor has been on the Angular team since the inception of Angular 2. While at Google, Victor developed dependency injection, change detection, forms, and the router. Today he is a co-founder at nrwl.io.",
198+
"bio": "Victor has been on the Angular team since the inception of Angular. While at Google, Victor developed dependency injection, change detection, forms, and the router. Today he is a co-founder at nrwl.io.",
199199
"type": "Community"
200200
},
201201
"jeffcross": {
202202
"name": "Jeff Cross",
203203
"picture": "/resources/images/bios/jeff-cross.jpg",
204204
"twitter": "jeffbcross",
205205
"website": "https://twitter.com/jeffbcross",
206-
"bio": "Jeff was one of the earliest core team members on Angular 1. He developed the Angular 2 http and AngularFire2 modules, contributed to RxJS 5, and was most recently the Tech Lead of the Angular Mobile team at Google. Jeff is a former Googler and co-founder at nrwl.io.",
206+
"bio": "Jeff was one of the earliest core team members on AngularJS. He developed the Angular http and AngularFire modules, contributed to RxJS 5, and was most recently the Tech Lead of the Angular Mobile team at Google. Jeff is a former Googler and co-founder at nrwl.io.",
207207
"type": "Community"
208208
},
209209
"alexwolfe": {
@@ -220,7 +220,7 @@
220220
"picture": "/resources/images/bios/marcy.jpg",
221221
"twitter": "marcysutton",
222222
"website": "http://marcysutton.com",
223-
"bio": "Marcy Sutton is a senior front-end engineer at Deque Systems, where she works on the axe-core team focusing on accessibility test integrations. Marcy is passionate about making the web accessible for everyone. She is a core team member to ngMaterial 1 and 2, where she regularly brings her accessibility expertise to the table–she is also a primary contributor to the ngAria module as well as an accessibility plugin for Protractor. She's in love with riding bicycles and snowboards and can often be found outside.",
223+
"bio": "Marcy Sutton is a senior front-end engineer at Deque Systems, where she works on the axe-core team focusing on accessibility test integrations. Marcy is passionate about making the web accessible for everyone. She is a core team member to Angular Material, where she regularly brings her accessibility expertise to the table–she is also a primary contributor to the ngAria module as well as an accessibility plugin for Protractor. She's in love with riding bicycles and snowboards and can often be found outside.",
224224
"type": "Community"
225225
},
226226

@@ -303,7 +303,7 @@
303303
"picture": "/resources/images/bios/michal.jpg",
304304
"twitter": "m_gol",
305305
"website": "https://plus.google.com/u/0/103101124310040612163/",
306-
"bio": "Front-end developer at Laboratorium EE, core contributor to Angular & jQuery. Makes sure Angular 1 & jQuery work fine together. Interested in new JavaScript standards.",
306+
"bio": "Front-end developer at Laboratorium EE, core contributor to Angular & jQuery. Makes sure AngularJS & jQuery work fine together. Interested in new JavaScript standards.",
307307
"type": "Community"
308308
},
309309

@@ -345,7 +345,7 @@
345345
"picture": "/resources/images/bios/patrick-stapleton.jpg",
346346
"twitter": "gdi2290",
347347
"website": "https://angularclass.com",
348-
"bio": "Also know as PatrickJS where JS stands for his middle and last names. Patrick is very active in Open-Source with over 4,300+ contributions in the last year alone on projects such as Angular2, AngularJS, FalcorJS, Docker, Bootstrap, gulp, and redis to name a few. He is also working on the development of Angular server-side rendering as Universal Angular and teaching Modern Web Development at AngularClass. He was previously the CTO of Keychain Logistics, a HackReactor Instructor and Alum.",
348+
"bio": "Also know as PatrickJS where JS stands for his middle and last names. Patrick is very active in Open-Source with over 4,300+ contributions in the last year alone on projects such as Angular, AngularJS, FalcorJS, Docker, Bootstrap, gulp, and redis to name a few. He is also working on the development of Angular server-side rendering as Universal Angular and teaching Modern Web Development at AngularClass. He was previously the CTO of Keychain Logistics, a HackReactor Instructor and Alum.",
349349
"type": "Community"
350350
},
351351

@@ -378,7 +378,7 @@
378378
"name": "Martin Staffa",
379379
"picture": "/resources/images/bios/martinstaffa.jpg",
380380
"twitter": "Narretz",
381-
"bio": "Martin is an English major turned web developer who loves frontend stuff. He's been part of the Angular 1 team since 2014. If you can't find him roaming the Github issue queues, he's probably out with his camera somewhere.",
381+
"bio": "Martin is an English major turned web developer who loves frontend stuff. He's been part of the AngularJS team since 2014. If you can't find him roaming the Github issue queues, he's probably out with his camera somewhere.",
382382
"type": "Community"
383383
},
384384

@@ -414,7 +414,7 @@
414414
"picture": "/resources/images/bios/deborah.jpg",
415415
"twitter": "deborahkurata",
416416
"website": "http://blogs.msmvps.com/deborahk/",
417-
"bio": "Deborah is an independent software developer and author. She is author of several Pluralsight courses including: 'Angular 2: Getting Started'",
417+
"bio": "Deborah is an independent software developer and author. She is author of several Pluralsight courses including: 'Angular: Getting Started'",
418418
"type": "Community"
419419
},
420420

@@ -516,7 +516,7 @@
516516
"picture": "/resources/images/bios/devversion.jpg",
517517
"website": "http://github.com/DevVersion/",
518518
"twitter": "DevVersion",
519-
"bio": "Paul is an aspiring 16-year-old developer living in Germany. While attending school, Paul works as a core team member on the Angular Material projects. He is a prolific contributor to all aspects of Angular 1 and Angular 2 and hopes to work at Google during his college studies!",
519+
"bio": "Paul is an aspiring 16-year-old developer living in Germany. While attending school, Paul works as a core team member on the Angular Material projects. He is a prolific contributor to all aspects of AngularJS and Angular and hopes to work at Google during his college studies!",
520520
"type": "Community"
521521
},
522522

public/cardboard/index.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ style(rel='stylesheet').
3030
li.
3131
Best Technology Demonstration
3232
<br>
33-
<small>Huge hint: Angular 2 scores points</small>
33+
<small>Huge hint: Angular scores points</small>
3434

3535
p Don’t have Cardboard and want one? Check out:
3636
p.text-center

public/docs/_examples/cb-a1-a2-quick-reference/ts/plnkr.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

public/docs/_examples/cb-a1-a2-quick-reference/e2e-spec.ts renamed to public/docs/_examples/cb-ajs-quick-reference/e2e-spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'use strict'; // necessary for es6 output in node
1+
'use strict'; // necessary for es6 output in node
22

33
import { browser, element, by } from 'protractor';
44

5-
describe('Angular 1 to 2 Quick Reference Tests', function () {
5+
describe('AngularJS to Angular Quick Reference Tests', function () {
66

77
beforeAll(function () {
88
browser.get('');

public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.component.ts renamed to public/docs/_examples/cb-ajs-quick-reference/ts/app/app.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export class AppComponent {
2020
movie: IMovie = null;
2121
movies: IMovie[] = [];
2222
showImage = true;
23-
title: string = 'A1-A2 Quick Ref Cookbook';
23+
title: string = 'AngularJS to Angular Quick Ref Cookbook';
2424
toggleImage(event: UIEvent) {
2525
this.showImage = !this.showImage;
2626
this.eventType = (event && event.type) || 'not provided';

public/docs/_examples/cb-a1-a2-quick-reference/ts/index.html renamed to public/docs/_examples/cb-ajs-quick-reference/ts/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<base href="/">
55
<meta charset="UTF-8">
6-
<title>Angular 1 to Angular 2 Quick Reference</title>
6+
<title>AngularJS to Angular Quick Reference</title>
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<!-- #docregion style -->
99
<link rel="stylesheet" href="styles.css">
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"description": "AngularJS to Angular Quick Reference",
3+
"files":[
4+
"!**/*.d.ts",
5+
"!**/*.js",
6+
"!**/*.[1].*"
7+
],
8+
"tags":["cookbook", "angularjs"]
9+
}

public/docs/_examples/cb-i18n/e2e-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe('i18n E2E Tests', () => {
1919

2020
it('should display the translated title attribute', function () {
2121
const title = element(by.css('img')).getAttribute('title');
22-
expect(title).toBe('Logo de Angular 2');
22+
expect(title).toBe('Logo de Angular');
2323
});
2424

2525
it('should display the plural of: a horde of wolves', function () {

public/docs/_examples/cb-i18n/ts/app/app.component.1.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ <h1 i18n="An introduction header for this sample">Hello i18n!</h1>
1111
<!--#enddocregion i18n-attribute-desc-->
1212

1313
<!--#docregion i18n-title-->
14-
<img [src]="logo" title="Angular 2 logo">
14+
<img [src]="logo" title="Angular logo">
1515
<!--#enddocregion i18n-title-->

public/docs/_examples/cb-i18n/ts/app/app.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h1 i18n="User welcome|An introduction header for this sample">Hello i18n!</h1>
1818
<br />
1919

2020
<!--#docregion i18n-title-translate-->
21-
<img [src]="logo" i18n-title title="Angular 2 logo" />
21+
<img [src]="logo" i18n-title title="Angular logo" />
2222
<!--#enddocregion i18n-title-translate-->
2323
<br>
2424
<button (click)="inc(1)">+</button> <button (click)="inc(-1)">-</button>

public/docs/_examples/cb-i18n/ts/locale/messages.es.xlf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ I don&apos;t output any element either
2020
<note priority="1" from="description">optional description</note>
2121
<note priority="1" from="meaning">optional meaning</note>
2222
</trans-unit>
23-
<trans-unit id="35ab5d6121ecbe0decdda638571a5a55ac77d5c4" datatype="html">
24-
<source>Angular 2 logo</source>
25-
<target>Logo de Angular 2</target>
23+
<trans-unit id="701174153757adf13e7c24a248c8a873ac9f5193" datatype="html">
24+
<source>Angular logo</source>
25+
<target>Logo de Angular</target>
2626
</trans-unit>
2727
<trans-unit id="6e22e74e8cbd3095560cfe08993c4fdfa3c50eb0" datatype="html">
2828
<source/>

public/docs/_examples/cb-i18n/ts/locale/messages.es.xlf.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
<note priority="1" from="description">optional description</note>
2424
<note priority="1" from="meaning">optional meaning</note>
2525
</trans-unit>
26-
<trans-unit id="35ab5d6121ecbe0decdda638571a5a55ac77d5c4" datatype="html">
27-
<source>Angular 2 logo</source>
28-
<target>Logo de Angular 2</target>
26+
<trans-unit id="701174153757adf13e7c24a248c8a873ac9f5193" datatype="html">
27+
<source>Angular logo</source>
28+
<target>Logo de Angular</target>
2929
</trans-unit>
3030
<!-- #enddocregion translated-other-nodes -->
3131
<!-- #docregion translated-plural -->

public/docs/_examples/cb-i18n/ts/messages.xlf

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,14 @@ I don&apos;t output any element either
2020
<note priority="1" from="description">optional description</note>
2121
<note priority="1" from="meaning">optional meaning</note>
2222
</trans-unit>
23-
<trans-unit id="35ab5d6121ecbe0decdda638571a5a55ac77d5c4" datatype="html">
24-
<source>Angular 2 logo</source>
23+
<trans-unit id="701174153757adf13e7c24a248c8a873ac9f5193" datatype="html">
24+
<source>Angular logo</source>
25+
<target/>
26+
</trans-unit>
27+
<trans-unit id="2579611bfcccd75bcd41fac90150d27d6ebb30b8" datatype="html">
28+
<source>
29+
<x id="START_TAG_SPAN" ctype="x-span"/><x id="ICU"/><x id="CLOSE_TAG_SPAN" ctype="x-span"/>
30+
</source>
2531
<target/>
2632
</trans-unit>
2733
<trans-unit id="6e22e74e8cbd3095560cfe08993c4fdfa3c50eb0" datatype="html">

public/docs/_examples/upgrade-module/ts/index-1-2-hybrid-bootstrap.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<html>
33
<head>
4-
<title>Angular 2 Upgrade</title>
4+
<title>Angular Upgrade</title>
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link rel="stylesheet" href="styles.css">

public/docs/_examples/upgrade-module/ts/index-1-to-2-projection.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<html>
33
<head>
4-
<title>Angular 2 Upgrade</title>
4+
<title>Angular Upgrade</title>
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link rel="stylesheet" href="styles.css">

public/docs/_examples/upgrade-module/ts/index-1-to-2-providers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<html>
33
<head>
4-
<title>Angular 2 Upgrade</title>
4+
<title>Angular Upgrade</title>
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link rel="stylesheet" href="styles.css">

public/docs/_examples/upgrade-module/ts/index-2-to-1-providers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<html>
33
<head>
4-
<title>Angular 2 Upgrade</title>
4+
<title>Angular Upgrade</title>
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link rel="stylesheet" href="styles.css">

public/docs/_examples/upgrade-module/ts/index-2-to-1-transclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<html>
33
<head>
4-
<title>Angular 2 Upgrade</title>
4+
<title>Angular Upgrade</title>
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link rel="stylesheet" href="styles.css">

public/docs/_examples/upgrade-module/ts/index-downgrade-io.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<html>
33
<head>
4-
<title>Angular 2 Upgrade</title>
4+
<title>Angular Upgrade</title>
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link rel="stylesheet" href="styles.css">

public/docs/_examples/upgrade-module/ts/index-downgrade-static.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<html>
33
<head>
4-
<title>Angular 2 Upgrade</title>
4+
<title>Angular Upgrade</title>
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link rel="stylesheet" href="styles.css">

public/docs/_examples/upgrade-module/ts/index-upgrade-io.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<html>
33
<head>
4-
<title>Angular 2 Upgrade</title>
4+
<title>Angular Upgrade</title>
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link rel="stylesheet" href="styles.css">

public/docs/_examples/upgrade-module/ts/index-upgrade-static.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<html>
33
<head>
4-
<title>Angular 2 Upgrade</title>
4+
<title>Angular Upgrade</title>
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<link rel="stylesheet" href="styles.css">

public/docs/_examples/upgrade-phonecat-1-typescript/README.md

Lines changed: 2 additions & 2 deletions

public/docs/_examples/upgrade-phonecat-1-typescript/ts/app/core/checkmark/checkmark.filter.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// #docregion
2-
32
angular.
43
module('core').
54
filter('checkmark', function() {

public/docs/_examples/upgrade-phonecat-1-typescript/ts/run-unit-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## The boilerplate Karma configuration won't work with Angular 1 tests since
1+
## The boilerplate Karma configuration won't work with AngularJS tests since
22
## a specific loading configuration is needed for them.
33
## We keep one in karma.conf.ng1.js. This scripts runs the ng1 tests with
44
## that config.

0 commit comments

Comments
 (0)