Skip to content
This repository was archived by the owner on Oct 17, 2023. It is now read-only.

Commit 24382d3

Browse files
committed
Denoting ES6/7 name changes to JS 2015/6
1 parent 7a1c242 commit 24382d3

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

lessons/00-introduction.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ The chapter makes mention of ECMA and ECMAScript. These are terms you’ll hear
1515

1616
ES6 (ECMAScript 6, also known as “Harmony”) is a big, hot topic right now. We’ll be talking more about that as we go.
1717

18+
**ALERT**: As of late May, 2015:
19+
20+
* ES6 has been renamed `JS 2015`
21+
* ES7 will be called `JS 2016`
22+
1823
For now, most of what you’ll see is ES5, the flavor of JavaScript supported by [basically every browser](http://kangax.github.io/compat-table/es5/).
1924

2025
### Platforms and Engines
@@ -63,23 +68,23 @@ window
6368

6469
and hit enter.
6570

66-
What this does is display (print out) a representation of the value for the identifier `window`. `window` is a JavaScript `Object` that is made available by the `environment` in the browser (if "Object" and "environment" are mysterious concepts as of yet, don't fret, they'll come up later).
71+
What this does is display (print out) a representation of the value for the identifier `window`. `window` is a JavaScript `Object` that is made available by the `environment` in the browser (if "Object" and "environment" are mysterious concepts as of yet, don't fret, they'll come up later).
6772

6873
Expand the `window` object and explore it a bit, especially the stuff under the `document` property (itself another object...it's objects all the way down!). The `document` object contains representations of a lot of stuff about the web document in the browser window and you may start seeing some items that look familiar here.
6974

7075
### Exercise 2: ScratchPad, `window` object redux
7176

7277
In Firefox, go to `Tools -> Web Developer -> Scratchpad...`. You can [read more about it here](https://developer.mozilla.org/en-US/docs/Tools/Scratchpad) if you like.
7378

74-
The console in Web Inspector or the Console in Firefox are useful for quick, one-line things (in the previous example, `window` gets evaluated as soon as you hit enter), but ScratchPad gives you the ability to run longer chunks of JavaScript code in the browser environment.
79+
The console in Web Inspector or the Console in Firefox are useful for quick, one-line things (in the previous example, `window` gets evaluated as soon as you hit enter), but ScratchPad gives you the ability to run longer chunks of JavaScript code in the browser environment.
7580

7681
Type
7782

7883
```javascript```
7984
window
8085
```
8186
82-
and hit enter.
87+
and hit enter.
8388
8489
Now click the `Run` button. Nothing happens. That's because we're not _in_ the console, the way we were when we were in the Web Inspector console above. This isn't a console, so things aren't logging out (displaying their values). But what if we wanted to examine the `window` object? There are two options. One is to right-click the `window` text and choose `Inspect` from the pop-up menu (this lets you explore the current state of the `window` object on that line).
8590

0 commit comments

Comments
 (0)