diff --git a/gulpfile.js b/gulpfile.js index 62997450..a4ee1ad2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -4,6 +4,7 @@ var gulp = require('gulp'); var prettify = require('gulp-jsbeautifier'); var babel = require('gulp-babel'); var changed = require('gulp-changed'); +var esformatter = require('gulp-esformatter'); var del = require('del'); var electron = require('electron-connect').server.create({ path: './build' @@ -13,7 +14,9 @@ var packager = require('electron-packager'); var sources = ['**/*.js', '**/*.css', '**/*.html', '!**/node_modules/**', '!**/build/**', '!release/**']; var app_root = 'src'; -gulp.task('prettify', ['sync-meta'], function() { +gulp.task('prettify', ['prettify:sources', 'prettify:jsx']); + +gulp.task('prettify:sources', ['sync-meta'], function() { gulp.src(sources) .pipe(prettify({ html: { @@ -30,6 +33,17 @@ gulp.task('prettify', ['sync-meta'], function() { .pipe(gulp.dest('.')); }); +gulp.task('prettify:jsx', function() { + return gulp.src(app_root + '/**/*.jsx') + .pipe(esformatter({ + indent: { + value: ' ' + }, + plugins: ['esformatter-jsx'] + })) + .pipe(gulp.dest(app_root)); +}) + gulp.task('build', ['build:jsx']); gulp.task('build:jsx', function() { diff --git a/package.json b/package.json index 4cacf024..fb48d9a8 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,12 @@ "electron-connect": "^0.3.3", "electron-packager": "^5.1.0", "electron-prebuilt": "^0.35.1", + "esformatter": "^0.8.1", + "esformatter-jsx": "^4.0.6", "gulp": "^3.9.0", "gulp-babel": "^6.1.1", "gulp-changed": "^1.3.0", + "gulp-esformatter": "^5.0.0", "gulp-jsbeautifier": "^1.0.1", "mocha": "^2.3.4", "should": "^8.0.1", diff --git a/src/settings.jsx b/src/settings.jsx index 7c67a5b6..c45d0517 100644 --- a/src/settings.jsx +++ b/src/settings.jsx @@ -11,10 +11,14 @@ var SettingsPage = React.createClass({ }, componentDidMount: function() { var config = settings.readFileSync(this.props.configFile); - this.setState({teams: config.teams}) + this.setState({ + teams: config.teams + }) }, handleTeamsChange: function(teams) { - this.setState({teams: teams}); + this.setState({ + teams: teams + }); }, handleOK: function() { var config = { @@ -30,91 +34,111 @@ var SettingsPage = React.createClass({ render: function() { return (