summaryrefslogtreecommitdiffhomepage
path: root/javascript.html.markdown
diff options
context:
space:
mode:
authorVojta Svoboda <vojtasvoboda.cz@gmail.com>2015-10-08 22:15:32 +0200
committerVojta Svoboda <vojtasvoboda.cz@gmail.com>2015-10-08 22:15:32 +0200
commit838701b917bb914f3483b6e9233920a752d20f82 (patch)
treea430654109b2f8e6a47eddf057f86d73630314a7 /javascript.html.markdown
parent4d619e9b0fc4a061fa720b47b22068c8661e9be6 (diff)
parentabd7444f9e5343f597b561a69297122142881fc8 (diff)
Merge branch 'master' into translation/json-cs
Diffstat (limited to 'javascript.html.markdown')
-rw-r--r--javascript.html.markdown12
1 files changed, 6 insertions, 6 deletions
diff --git a/javascript.html.markdown b/javascript.html.markdown
index ba2e8ce4..754832f1 100644
--- a/javascript.html.markdown
+++ b/javascript.html.markdown
@@ -64,7 +64,7 @@ doStuff()
// There are three special not-a-real-number values:
Infinity; // result of e.g. 1/0
-Infinity; // result of e.g. -1/0
-NaN; // result of e.g. 0/0
+NaN; // result of e.g. 0/0, stands for 'Not a Number'
// There's also a boolean type.
true;
@@ -189,7 +189,7 @@ myObj.myFourthKey; // = undefined
///////////////////////////////////
// 3. Logic and Control Structures
-// The syntax for this section is almost identical to Java's.
+// The syntax for this section is almost identical to Java's.
// The `if` structure works as you'd expect.
var count = 1;
@@ -231,8 +231,8 @@ var name = otherName || "default";
// The `switch` statement checks for equality with `===`.
-// use 'break' after each case
-// or the cases after the correct one will be executed too.
+// use 'break' after each case
+// or the cases after the correct one will be executed too.
grade = 'B';
switch (grade) {
case 'A':
@@ -516,12 +516,12 @@ more about how to use JavaScript in web pages, start by learning about the
[Document Object
Model](https://developer.mozilla.org/en-US/docs/Using_the_W3C_DOM_Level_1_Core)
-[Learn Javascript by Example and with Challenges](http://www.learneroo.com/modules/64/nodes/350) is a variant of this reference with built-in challenges.
+[Learn Javascript by Example and with Challenges](http://www.learneroo.com/modules/64/nodes/350) is a variant of this reference with built-in challenges.
[JavaScript Garden](http://bonsaiden.github.io/JavaScript-Garden/) is an in-depth
guide of all the counter-intuitive parts of the language.
-[JavaScript: The Definitive Guide](http://www.amazon.com/gp/product/0596805527/) is a classic guide / reference book.
+[JavaScript: The Definitive Guide](http://www.amazon.com/gp/product/0596805527/) is a classic guide / reference book.
In addition to direct contributors to this article, some content is adapted
from Louie Dinh's Python tutorial on this site, and the [JS