We're not ready for ES6

Lets re-evaluate in June next year when it's actually released

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 MANIFEST
 /build
 /dist
@@ -23,4 +24,4 @@ libpathod
 node_modules
 bower_components
 *.compiled.js
-*.map
+*.map

web/gulpfile.js

@@ -32,17 +32,17 @@ var path = {
             'vendor/react-bootstrap/react-bootstrap.js'
         ],
         app: [
-            'js/Dispatcher.es6.js',
-            'js/actions.es6.js',
-            'js/stores/base.es6.js',
-            'js/stores/SettingsStore.es6.js',
-            'js/stores/EventLogStore.es6.js',
-            'js/Connection.es6.js',
-            'js/components/Header.react.js',
-            'js/components/TrafficTable.react.js',
-            'js/components/EventLog.react.js',
-            'js/components/Footer.react.js',
-            'js/components/ProxyApp.react.js',
+            'js/dispatcher.js',
+            'js/actions.js',
+            'js/stores/base.js',
+            'js/stores/settingstore.js',
+            'js/stores/eventlogstore.js',
+            'js/connection.js',
+            'js/components/header.jsx',
+            'js/components/traffictable.jsx',
+            'js/components/eventlog.jsx',
+            'js/components/footer.jsx',
+            'js/components/proxyapp.jsx',
             'js/app.js',
         ],
     },
@@ -81,7 +81,7 @@ function scripts(files, filename, dev) {
     return gulp.src(files, {base: "src", cwd: "src"})
         .pipe(dev ? dont_break_on_errors(): gutil.noop())
         .pipe(dev ? sourcemaps.init() : gutil.noop())
-        .pipe(react({harmony: true}))
+        .pipe(react({harmony: false}))
         .pipe(concat(filename))
         .pipe(!dev ? uglify() : gutil.noop())
         .pipe(dev ? sourcemaps.write(".", {sourceRoot: "/static"}) : gutil.noop())

web/src/js/actions.es6.js → web/src/js/actions.js

@@ -4,7 +4,7 @@ var ActionTypes = {
 };
 
 var SettingsActions = {
-    update(settings) {
+    update:function(settings) {
         settings = _.merge({}, SettingsStore.getAll(), settings);
         //TODO: Update server.
 
@@ -14,4 +14,4 @@ var SettingsActions = {
             settings: settings
         });
     }
-};
+};

web/src/js/components/EventLog.react.js → web/src/js/components/eventlog.jsx

@@ -1,31 +1,32 @@
 /** @jsx React.DOM */
 
 var EventLog = React.createClass({
-    getInitialState() {
+    getInitialState: function() {
         return {
             log: []
         };
     },
-    componentDidMount() {
+    componentDidMount: function() {
         this.log = EventLogStore.getView();
         this.log.addListener("change", this.onEventLogChange);
     },
-    componentWillUnmount() {
+    componentWillUnmount: function() {
         this.log.removeListener("change", this.onEventLogChange);
         this.log.close();
     },
-    onEventLogChange() {
+    onEventLogChange: function() {
         this.setState({
             log: this.log.getAll()
         });
     },
-    close() {
+    close: function() {
         SettingsActions.update({
             showEventLog: false
         });
     },
-    render() {
-        var messages = this.state.log.map(row => (<div key={row.id}>{row.message}</div>));
+    render: function() {
+        //var messages = this.state.log.map(row => (<div key={row.id}>{row.message}</div>));
+        var messages = [];
         return (
             <div className="eventlog">
                 <pre>
@@ -35,4 +36,4 @@ var EventLog = React.createClass({
             </div>
         );
     }
-});
+});

web/src/js/components/Footer.react.js → web/src/js/components/footer.jsx

@@ -1,12 +1,12 @@
 /** @jsx React.DOM */
 
 var Footer = React.createClass({
-    render(){
+    render: function(){
         var mode = this.props.settings.mode;
         return (
             <footer>
                 {mode != "regular" ? <span className="label label-success">{mode} mode</span> : null}
             </footer>
         );
     }
-});
+});