ff-stream-web

commit cd55612a070c969da5fc2472d9b352a662c8e013
parent 1640ce52da53bddd20995c732ede2f52f8c0889a
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Tue, 16 Sep 2014 17:55:31 +0400

Update .jsx files to ES6

Diffstat:
M
config/webpack.config.js
 | 
2
+-
M
src/app.jsx
 | 
15
++++-----------
M
src/components/Navbar.jsx
 | 
2
+-
M
src/layouts/Default.jsx
 | 
4
++--
M
src/pages/Home.jsx
 | 
2
+-
M
src/pages/Privacy.jsx
 | 
2
+-

6 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -64,7 +64,7 @@ module.exports = function (release) {
         },
         {
           test: /\.jsx$/,
-          loader: 'jsx-loader'
+          loader: 'jsx-loader?harmony'
         }
       ]
     }
diff --git a/src/app.jsx b/src/app.jsx
@@ -5,20 +5,13 @@
 'use strict';
 
 var React = require('react');
-var Router = require('react-router');
-
-var Routes = Router.Routes;
-var Route = Router.Route;
-
-var DefaultLayout = require('./layouts/Default.jsx');
-var HomePage = require('./pages/Home.jsx');
-var PrivacyPage = require('./pages/Privacy.jsx');
+var {Routes, Route} = require('react-router');
 
 React.renderComponent(
   <Routes location="history">
-    <Route name="app" path="/" handler={DefaultLayout}>
-      <Route name="home" path="/" handler={HomePage} />
-      <Route name="privacy" path="/privacy" handler={PrivacyPage} />
+    <Route name="app" path="/" handler={require('./layouts/Default.jsx')}>
+      <Route name="home" path="/" handler={require('./pages/Home.jsx')} />
+      <Route name="privacy" handler={require('./pages/Privacy.jsx')} />
     </Route>
   </Routes>,
   document.body
diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
@@ -7,7 +7,7 @@
 var React = require('react');
 
 var Navbar = React.createClass({
-  render: function () {
+  render: () => {
     return (
       <div className="navbar-top">
         <div className="container">
diff --git a/src/layouts/Default.jsx b/src/layouts/Default.jsx
@@ -5,11 +5,11 @@
 'use strict';
 
 var React = require('react');
-var Link = require('react-router').Link;
+var {Link} = require('react-router');
 var Navbar = require('../components/Navbar.jsx');
 
 var DefaultLayout = React.createClass({
-  render: function () {
+  render: () => {
     return (
       <div>
         <Navbar />
diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
@@ -7,7 +7,7 @@
 var React = require('react');
 
 var HomePage = React.createClass({
-  render: function () {
+  render: () => {
     return (
       <div className="container">
         <h2>Facebook React Starter Kit</h2>
diff --git a/src/pages/Privacy.jsx b/src/pages/Privacy.jsx
@@ -7,7 +7,7 @@
 var React = require('react');
 
 var PrivacyPage = React.createClass({
-  render: function () {
+  render: () => {
     return (
       <div className="container">
         <h2>Privacy Policy</h2>