Skip to content

Commit c814589

Browse files
docs(*): ensure naming of Angular(JS) is accurate
1 parent 6d0c0f1 commit c814589

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/index.html

+13-13
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@
111111
<div class="center">
112112
<h1>HTML enhanced for web apps!</h1>
113113
<a class="btn btn-large btn-primary download-btn" href="" ng-click="showDownloadModal()">
114-
<i class="icon-download-alt icon-large"></i> Download AngularJS 1<br>
114+
<i class="icon-download-alt icon-large"></i> Download AngularJS<br>
115115
<img src="img/ng-logo.png"><br>
116116
<span class="version" ng-cloak>
117117
(<span ng-repeat="branch in BRANCHES | filter:{showOnButton: true}">{{branch.version}}{{ !$last ? ' / ' : '' }}</span>)
118118
</span>
119119
</a>&nbsp;
120120
<a href="http://angular.io" target="_blank" class="btn btn-large btn-primary ng2-beta">
121-
Try the new Angular 2<br>
121+
Try the new Angular<br>
122122
<img src="https://angular.io/resources/images/logos/angular2/angular.svg">
123123
</a>
124124

@@ -147,8 +147,8 @@ <h1>HTML enhanced for web apps!</h1>
147147
</ul>
148148

149149
<a class="learn-link" href="http://angular.codeschool.com">
150-
<img class="learn-link-badge" src="img/codeschool-badge.png" alt="Shaping up with Angular.js" width="52" height="52" />
151-
Learn Angular in your browser for free!
150+
<img class="learn-link-badge" src="img/codeschool-badge.png" alt="Shaping up with AngularJS" width="52" height="52" />
151+
Learn AngularJS in your browser for free!
152152
</a>
153153
</div>
154154
</div>
@@ -228,7 +228,7 @@ <h3>Controller</h3>
228228
<h3>Plain JavaScript</h3>
229229
<p>
230230
Unlike other frameworks, there is no need to inherit from proprietary types in order to wrap the
231-
model in accessors methods. Angular models are plain old JavaScript objects. This makes your code easy to
231+
model in accessors methods. AngularJS models are plain old JavaScript objects. This makes your code easy to
232232
test, maintain, reuse, and again free from boilerplate.
233233
</p>
234234
</div>
@@ -282,7 +282,7 @@ <h3>Server Communication</h3>
282282
AngularJS provides built-in services on top of XHR as well as various other backends
283283
using third party libraries. Promises further simplify your code
284284
by handling asynchronous return of data. In this example, we use the AngularFire
285-
library to wire up a <a href="https://www.firebase.com/">Firebase</a> backend to a simple Angular app.
285+
library to wire up a <a href="https://www.firebase.com/">Firebase</a> backend to a simple AngularJS app.
286286
</p>
287287
</div>
288288
</div>
@@ -309,7 +309,7 @@ <h1 id="create-components">Create Components</h1>
309309
<div class="span4">
310310
<h3>Directives</h3>
311311
<p>
312-
Directives are a unique and powerful feature available only in Angular. Directives let
312+
Directives are a unique and powerful feature available in AngularJS. Directives let
313313
you invent new HTML syntax, specific to your application.
314314
</p>
315315
</div>
@@ -324,7 +324,7 @@ <h3>Reusable Components</h3>
324324
<div class="span4">
325325
<h3>Localization</h3>
326326
<p>
327-
An important part of serious apps is localization. Angular's locale aware filters and
327+
An important part of serious apps is localization. AngularJS's locale aware filters and
328328
stemming directives give you building blocks to make your application available in all
329329
locales.
330330
</p>
@@ -451,8 +451,8 @@ <h1>Hello {{yourName}}!</h1>
451451
.controller('TodoListController', function() {
452452
var todoList = this;
453453
todoList.todos = [
454-
{text:'learn angular', done:true},
455-
{text:'build an angular app', done:false}];
454+
{text:'learn AngularJS', done:true},
455+
{text:'build an AngularJS app', done:false}];
456456

457457
todoList.addTodo = function() {
458458
todoList.todos.push({text:todoList.todoText, done:false});
@@ -657,7 +657,7 @@ <h2>Todo</h2>
657657
description: 'HTML enhanced for web apps!'
658658
},
659659
{
660-
name: 'Angular 2',
660+
name: 'Angular',
661661
site: 'http://angular.io',
662662
description: 'One framework. Mobile and desktop.'
663663
},
@@ -776,7 +776,7 @@ <h2>JavaScript Projects</h2>
776776
, "angular-resource.min.js": "Load AngularJS resource module."
777777
, "angular-route.min.js": "Load AngularJS route module."
778778
, "firebase.js": "Load the Firebase JavaScript SDK."
779-
, "angularfire.min.js": "Load the Angular bindings for Firebase."
779+
, "angularfire.min.js": "Load the AngularJS bindings for Firebase."
780780
, "project.js": "The <code>project.js</code> file contains the controllers which specify your application’s behavior."
781781
, "ng-view": "We’re marking this <code>&lt;div&gt;</code> as the place we’ll load partial pages or “views”. The surrounding page will stay static while we load changing UI into this section. In this case, we’ll be switching between a list of “projects” and the form to add new or edit existing “projects”."
782782
}
@@ -786,7 +786,7 @@ <h2>JavaScript Projects</h2>
786786
, "value": "Define a singleton object that can be injected into controllers and services."
787787
, "fbURL": "The URL to the Firebase location from which we want to load data (and store changes)."
788788
, "factory": "Define a factory that will return a singleton object that can be injected into controllers and services."
789-
, "$firebase": "A service provided by AngularFire for binding data from Firebase to Angular models."
789+
, "$firebase": "A service provided by AngularFire for binding data from Firebase to AngularJS models."
790790
, "$asArray": "A method that returns data from Firebase in the form of a synchronized array."
791791
, "config": "You use <code>config()</code> to configure existing services. Here, we’re configuring the <code>$routeProvider</code> responsible for mapping URL paths to partials."
792792
, "controller": "Define a controller function that can be attached to the DOM using <code>ng-controller</code> or to a view template by specifying it in the route configuration."

src/js/download-data.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ angular.module('download-data', [])
4040
" <dt>Uncompressed</dt>"+
4141
" <dd>The main AngularJS source code, as is. Useful for debugging and development purpose, but should ideally not be used in your deployed application</dd>"+
4242
" <dt>Zipped</dt>"+
43-
" <dd>The zipped version of the Angular Build, which contains both the builds of AngularJS, as well as documentation and other extras</dd>"+
43+
" <dd>The zipped version of the AngularJS Build, which contains both the builds of AngularJS, as well as documentation and other extras</dd>"+
4444
"</dl>",
4545

4646
cdnInfo:

test/angularjs.org.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ describe('Angularjs.org', function () {
7878
});
7979

8080

81-
it('should allow downloading uncompressed angular', function () {
81+
it('should allow downloading uncompressed AngularJS', function () {
8282
var uncompressedBtn = browser.findElement(
8383
by.css(
8484
'.download-modal .modal-body > dl button.uncompressed'));
@@ -179,7 +179,7 @@ describe('Angularjs.org', function () {
179179
element(by.id('projects_search')).sendKeys('Ang');
180180
browser.driver.sleep(50);
181181
expect(list.count()).toBe(2);
182-
expect(list.get(0).getText()).toContain('Angular 2');
182+
expect(list.get(0).getText()).toContain('Angular');
183183
expect(list.get(1).getText()).toContain('AngularJS');
184184
browser.driver.sleep(5000);
185185
});

0 commit comments

Comments
 (0)