Merge pull request #2 from airbnb/master

updating repo

Author: bishopZ

README.md

@@ -83,23 +83,40 @@
  var item ={};
 ```
 
-- Don't use [reserved words](https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Reserved_Words) as keys.
+- Don't use [reserved words](http://es5.github.io/#x7.6.1) as keys. It won't work inIE8. [More info](https://github.com/airbnb/javascript/issues/61)
 
 ```javascript
  // bad
  var superman ={
- class: 'superhero',
  default:{clark: 'kent'},
  private: true
  };
 
  // good
  var superman ={
- klass: 'superhero',
  defaults:{clark: 'kent'},
  hidden: true
  };
 ```
+
+- Use readable synonyms in place of reserved words.
+
+```javascript
+ // bad
+ var superman ={
+ class: 'alien'
+ };
+
+ // bad
+ var superman ={
+ klass: 'alien'
+ };
+
+ // good
+ var superman ={
+ type: 'alien'
+ };
+```
 **[[⬆]](#TOC)**
 
 ## <a name='arrays'>Arrays</a>
@@ -203,7 +220,8 @@
  ```javascript
  var items,
  messages,
- length, i;
+ length,
+ i;
 
  messages = [{
  state: 'success',
@@ -503,18 +521,17 @@
 varnamed=functionsuperPower(){
 console.log('Flying');
  };
+ }
 
+// the same is true when the function name
+// is the same as the variable name.
+functionexample(){
+console.log(named); // => undefined
 
-// the same is true when the function name
-// is the same as the variable name.
-functionexample(){
-console.log(named); // => undefined
-
-named(); // => TypeError named is not a function
+named(); // => TypeError named is not a function
 
-varnamed=functionnamed(){
-console.log('named');
- };
+varnamed=functionnamed(){
+console.log('named');
  }
  }
 ```
@@ -648,7 +665,7 @@
  }
 ```
 
- - Use `//` for single line comments. Place single line comments on a newline above the subject of the comment. Put an emptyline before the comment.
+ - Use `//` for single line comments. Place single line comments on a newline above the subject of the comment. Put an empty line before the comment.
 
 ```javascript
  // bad
@@ -914,7 +931,6 @@
  ```
 
  - Use `parseInt` for Numbers and always with a radix for type casting.
- - If for whatever reason you are doing something wild and `parseInt` is your bottleneck and need to use Bitshift for [performance reasons](http://jsperf.com/coercion-vs-casting/3), leave a comment explaining why and what you're doing.
 
  ```javascript
  var inputValue = '4';
@@ -936,7 +952,11 @@
 
  // good
  var val = parseInt(inputValue, 10);
+ ```
+
+ - If for whatever reason you are doing something wild and `parseInt` is your bottleneck and need to use Bitshift for [performance reasons](http://jsperf.com/coercion-vs-casting/3), leave a comment explaining why and what you're doing.
 
+```javascript
  // good
  /**
  * parseInt was the reason my code was slow.
@@ -1250,7 +1270,7 @@
 
 ## <a name='modules'>Modules</a>
 
- - The module should start with a `!`. This ensures that if a malformed module forgets to include a final semicolon there aren't errors in production when the scripts get concatenated.
+ - The module should start with a `!`. This ensures that if a malformed module forgets to include a final semicolon there aren't errors in production when the scripts get concatenated. [Explanation](https://github.com/airbnb/javascript/issues/44#issuecomment-13063933)
 - The file should be named with camelCase, live in a folder with the same name, and match the name of the single export.
 - Add a method called noConflict() that sets the exported module to the previous version and returns this one.
 - Always declare `'use strict'` at the top of the module.
@@ -1323,7 +1343,7 @@
 
 ```javascript
  // bad
- $('.sidebar', 'ul').hide();
+ $('ul', '.sidebar').hide();
 
  // bad
  $('.sidebar').find('ul').hide();
@@ -1334,11 +1354,8 @@
  // good
  $('.sidebar > ul').hide();
 
- // good (slower)
+ // good
  $sidebar.find('ul');
-
- // good (faster)
- $($sidebar[0]).find('ul');
 ```
 
 **[[⬆]](#TOC)**
@@ -1399,6 +1416,7 @@
 **Further Reading**
 
 - [Understanding JavaScript Closures](http://javascriptweblog.wordpress.com/2010/10/25/understanding-javascript-closures/) - Angus Croll
+- [Basic JavaScript for the impatient programmer](http://www.2ality.com/2013/06/basic-javascript.html) - Dr. Axel Rauschmayer
 
 **Books**
 
@@ -1410,6 +1428,10 @@
 - [JavaScript Web Applications](http://www.amazon.com/JavaScript-Web-Applications-Alex-MacCaw/dp/144930351X) - Alex MacCaw
 - [Pro JavaScript Techniques](http://www.amazon.com/Pro-JavaScript-Techniques-John-Resig/dp/1590597273) - John Resig
 - [Smashing Node.js: JavaScript Everywhere](http://www.amazon.com/Smashing-Node-js-JavaScript-Everywhere-Magazine/dp/1119962595) - Guillermo Rauch
+- [Secrets of the JavaScript Ninja](http://www.amazon.com/Secrets-JavaScript-Ninja-John-Resig/dp/193398869X) - John Resig and Bear Bibeault
+- [Human JavaScript](http://humanjavascript.com/) - Henrik Joreteg
+- [Superhero.js](http://superherojs.com/) - Kim Joar Bekkelund, Mads Mobæk, & Olav Bjorkoy
+- [JSBooks](http://jsbooks.revolunet.com/)
 
 **Blogs**
 
@@ -1437,6 +1459,7 @@
  - **ExactTarget**: [ExactTarget/javascript](https://github.com/ExactTarget/javascript)
  - **GeneralElectric**: [GeneralElectric/javascript](https://github.com/GeneralElectric/javascript)
  - **GoodData**: [gooddata/gdc-js-style](https://github.com/gooddata/gdc-js-style)
+ - **Grooveshark**: [grooveshark/javascript](https://github.com/grooveshark/javascript)
  - **How About We**: [howaboutwe/javascript](https://github.com/howaboutwe/javascript)
  - **MinnPost**: [MinnPost/javascript](https://github.com/MinnPost/javascript)
  - **ModCloth**: [modcloth/javascript](https://github.com/modcloth/javascript)
@@ -1456,6 +1479,7 @@
  - :jp: **Japanese**: [mitsuruog/javacript-style-guide](https://github.com/mitsuruog/javacript-style-guide)
  - :br: **Portuguese**: [armoucar/javascript-style-guide](https://github.com/armoucar/javascript-style-guide)
  - :cn: **Chinese**: [adamlu/javascript-style-guide](https://github.com/adamlu/javascript-style-guide)
+ - :es: **Spanish**: [paolocarrasco/javascript-style-guide](https://github.com/paolocarrasco/javascript-style-guide)
 
 ## <a name='guide-guide'>The JavaScript Style Guide Guide</a>