Syntax tweaks

Author: mjackson

UPGRADE_GUIDE.md

@@ -232,12 +232,12 @@ control of rendering.
 
 ```js
 // v0.10.x
-Router.renderRoutesToString(routes, path, function(html) {
+Router.renderRoutesToString(routes, path, function (html) {
  // do something with `html`
 });
 
 // v0.11.x
-Router.run(routes, path, function(Handler) {
+Router.run(routes, path, function (Handler) {
   var html = React.renderToString(<Handler/>);
 });
 ```

docs/guides/server-rendering.md

@@ -20,7 +20,7 @@ var routes = (
 // if using express it might look like this
 app.use(function (req, res) {
   // pass in `req.path` and the router will immediately match
-  Router.run(routes, req.path, function(Handler) {
+  Router.run(routes, req.path, function (Handler) {
     var content = React.renderToString(<Handler/>);
     res.render('main', {content: content});
   });

modules/components/__tests__/RouteHandler-test.js

@@ -25,7 +25,7 @@ describe('RouteHandler', function () {
         }.bind(this);
       },
 
-      render: function() {
+      render: function () {
         return (
           <div>
             <h1>Root</h1>
@@ -45,15 +45,15 @@ describe('RouteHandler', function () {
     var div = document.createElement('div');
     var steps = [];
 
-    steps.push(function(Handler, state) {
+    steps.push(function (Handler, state) {
       React.render(<Handler/>, div, function () {
         expect(div.innerHTML).toMatch(/Foo/);
         TestLocation.push('/bar');
       });
     });
 
-    steps.push(function(Handler, state) {
-      updateComponentBeforeNextRender(function() {
+    steps.push(function (Handler, state) {
+      updateComponentBeforeNextRender(function () {
         expect(div.innerHTML).toMatch(/Foo/);
         React.render(<Handler/>, div, function () {
           expect(div.innerHTML).toMatch(/Bar/);

modules/locations/HashLocation.js

@@ -4,7 +4,8 @@ var LocationActions = require('../actions/LocationActions');
 var Path = require('../utils/Path');
 
 /**
- * Returns the current URL path from the `hash` section of the URL, including query string
+ * Returns the current URL path from the `hash` portion of the URL, including
+ * query string.
  */
 function getHashPath() {
   invariant(
@@ -13,8 +14,8 @@ function getHashPath() {
   );
 
   return Path.decode(
-    //cannot use window.location.hash because its not consistent
-    //across browsers - Firefox will pre-decode it
+    // We can't use window.location.hash here because it's not
+    // consistent across browsers - Firefox will pre-decode it!
     window.location.href.split('#')[1] || ''
   );
 }

modules/locations/HistoryLocation.js

@@ -4,7 +4,7 @@ var LocationActions = require('../actions/LocationActions');
 var Path = require('../utils/Path');
 
 /**
- * Returns the current URL path from `window.location`, including query string
+ * Returns the current URL path from `window.location`, including query string.
  */
 function getWindowPath() {
   invariant(

modules/locations/__tests__/HashLocation-test.js

@@ -1,11 +1,11 @@
 var expect = require('expect');
 var HashLocation = require('../HashLocation');
 
-describe('HashLocation.getCurrentPath', function() {
+describe('HashLocation.getCurrentPath', function () {
 
   //this test is needed because Firefox will pre-decode the value retrieved from
   //window.location.hash
-  it('returns a properly decoded equivalent of what window.location.hash is set to', function() {
+  it('returns a properly decoded equivalent of what window.location.hash is set to', function () {
     window.location.hash = '';
     expect(HashLocation.getCurrentPath()).toBe('');
 
@@ -26,7 +26,7 @@ describe('HashLocation.getCurrentPath', function() {
 
     //decodeURI doesn't handle lone percents
     window.location.hash = '%';
-    expect(function() {
+    expect(function () {
       HashLocation.getCurrentPath();
     }).toThrow(URIError);
 
@@ -39,7 +39,7 @@ describe('HashLocation.getCurrentPath', function() {
         .toBe('complicated string/full%2Fof%3Fspecial%chars%20and%23escapesሴ');
   });
 
-  afterEach(function() {
+  afterEach(function () {
     window.location.hash = '';
   });
 });

modules/utils/createRouter.js

@@ -354,7 +354,7 @@ function createRouter(options) {
        * Router.*Location objects (e.g. Router.HashLocation or Router.HistoryLocation).
        */
       run: function (callback) {
-        var dispatchHandler = function(error, transition) {
+        var dispatchHandler = function (error, transition) {
           pendingTransition = null;
 
           if (error) {
@@ -364,7 +364,7 @@ function createRouter(options) {
           } else {
             callback.call(router, router, nextState);
           }
-        }
+        };
 
         if (typeof location === 'string') {
           warning(
@@ -383,9 +383,9 @@ function createRouter(options) {
           );
 
           // Listen for changes to the location.
-          var changeListener = function(change) {
+          var changeListener = function (change) {
             router.dispatch(change.path, change.type, dispatchHandler);
-          }
+          };
 
           if (location.addChangeListener)
             location.addChangeListener(changeListener);