Skip to content

Commit fe99f77

Browse files
mattmakaimattmakai
committed
changing around js page
1 parent 3f626ef commit fe99f77

File tree

3 files changed

+46
-13
lines changed

3 files changed

+46
-13
lines changed

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-06-28T09:20:48Z</updated></feed>
2+
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-06-29T10:41:41Z</updated></feed>

‎javascript.html‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,29 @@ <h1>JavaScript</h1>
4444
<h2>Why is JavaScript necessary?</h2>
4545
<p>JavaScript executes in the client and enables dynamic content and interaction
4646
that is not possible with HTML and CSS alone. Every modern Python web
47-
application uses JavaScript on the front end. The trend towards richer client
48-
experiences will increase as projects such as
49-
<a href="https://angularjs.org/">Angular.js</a>,
50-
<a href="http://backbonejs.org/">Backbone.js</a>, and
51-
<a href="http://emberjs.com/">Ember.js</a> continue to mature.</p>
52-
<h2>Where did JavaScript originate?</h2>
47+
application uses JavaScript on the front end. </p>
48+
<h2>Front end frameworks</h2>
49+
<p>Front end JavaScript frameworks move the rendering for most of a web
50+
application to the client side. Often these applications are informally
51+
referred to as "one page apps" because the webpage is not reloaded upon every
52+
click to a new URL. Instead, partial HTML pages are loaded into the
53+
document object model or data is retrieved through an API call then displayed
54+
on the existing page.</p>
55+
<p>Examples of these front end frameworks include:</p>
56+
<ul>
57+
<li>
58+
<p><a href="https://angularjs.org/">Angular.js</a></p>
59+
</li>
60+
<li>
61+
<p><a href="http://backbonejs.org/">Backbone.js</a></p>
62+
</li>
63+
<li>
64+
<p><a href="http://emberjs.com/">Ember.js</a></p>
65+
</li>
66+
</ul>
67+
<p>Front end frameworks are rapidly evolving. Over the next several years
68+
consensus about good practices for using the frameworks will emerge.</p>
69+
<h2>How did JavaScript originate?</h2>
5370
<p>JavaScript is an implementation of
5471
<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/JavaScript_Overview">the ECMAScript specification</a>
5572
which is defined by the

‎source/content/pages/05-client-side/0503-javascript.markdown‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,30 @@ to enable dynamic content and interaction.
2424
## Why is JavaScript necessary?
2525
JavaScript executes in the client and enables dynamic content and interaction
2626
that is not possible with HTML and CSS alone. Every modern Python web
27-
application uses JavaScript on the front end. The trend towards richer client
28-
experiences will increase as projects such as
29-
[Angular.js](https://angularjs.org/),
30-
[Backbone.js](http://backbonejs.org/), and
31-
[Ember.js](http://emberjs.com/) continue to mature.
27+
application uses JavaScript on the front end.
3228

3329

34-
## Where did JavaScript originate?
30+
## Front end frameworks
31+
Front end JavaScript frameworks move the rendering for most of a web
32+
application to the client side. Often these applications are informally
33+
referred to as "one page apps" because the webpage is not reloaded upon every
34+
click to a new URL. Instead, partial HTML pages are loaded into the
35+
document object model or data is retrieved through an API call then displayed
36+
on the existing page.
37+
38+
Examples of these front end frameworks include:
39+
40+
* [Angular.js](https://angularjs.org/)
41+
42+
* [Backbone.js](http://backbonejs.org/)
43+
44+
* [Ember.js](http://emberjs.com/)
45+
46+
Front end frameworks are rapidly evolving. Over the next several years
47+
consensus about good practices for using the frameworks will emerge.
48+
49+
50+
## How did JavaScript originate?
3551
JavaScript is an implementation of
3652
[the ECMAScript specification](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/JavaScript_Overview)
3753
which is defined by the

0 commit comments

Comments
 (0)