Fix prettify-task

This commit is contained in:
Yuya Ochiai
2016-02-12 01:12:28 +09:00
parent 3043d44d28
commit cec2b0f5dc
3 changed files with 11 additions and 12 deletions

View File

@@ -14,7 +14,6 @@ var electron = require('electron-connect').server.create({
var packager = require('electron-packager'); var packager = require('electron-packager');
var sources = ['**/*.js', '**/*.css', '**/*.html', '!**/node_modules/**', '!**/build/**', '!release/**']; var sources = ['**/*.js', '**/*.css', '**/*.html', '!**/node_modules/**', '!**/build/**', '!release/**'];
var app_root = 'dist';
gulp.task('prettify', ['prettify:sources', 'prettify:jsx']); gulp.task('prettify', ['prettify:sources', 'prettify:jsx']);
@@ -43,7 +42,7 @@ gulp.task('prettify:jsx', function() {
}, },
plugins: ['esformatter-jsx'] plugins: ['esformatter-jsx']
})) }))
.pipe(gulp.dest(app_root)); .pipe(gulp.dest('src/browser'));
}); });
gulp.task('build', ['sync-meta', 'webpack', 'copy'], function() { gulp.task('build', ['sync-meta', 'webpack', 'copy'], function() {
@@ -141,7 +140,7 @@ gulp.task('watch', ['build'], function() {
function makePackage(platform, arch, callback) { function makePackage(platform, arch, callback) {
var packageJson = require('./src/package.json'); var packageJson = require('./src/package.json');
packager({ packager({
dir: './' + app_root, dir: './dist',
name: packageJson.name, name: packageJson.name,
platform: platform, platform: platform,
arch: arch, arch: arch,

View File

@@ -130,7 +130,7 @@ var MainPage = React.createClass({
tabs_row = ( tabs_row = (
<Row> <Row>
<TabBar id="tabBar" teams={ this.props.teams } unreadCounts={ this.state.unreadCounts } mentionCounts={ this.state.mentionCounts } unreadAtActive={ this.state.unreadAtActive } mentionAtActiveCounts={ this.state.mentionAtActiveCounts } <TabBar id="tabBar" teams={ this.props.teams } unreadCounts={ this.state.unreadCounts } mentionCounts={ this.state.mentionCounts } unreadAtActive={ this.state.unreadAtActive } mentionAtActiveCounts={ this.state.mentionAtActiveCounts }
activeKey={ this.state.key } onSelect={ this.handleSelect }></TabBar> activeKey={ this.state.key } onSelect={ this.handleSelect }></TabBar>
</Row> </Row>
); );
} }

View File

@@ -16,7 +16,7 @@ const ListGroup = ReactBootstrap.ListGroup;
const ListGroupItem = ReactBootstrap.ListGroupItem; const ListGroupItem = ReactBootstrap.ListGroupItem;
const Glyphicon = ReactBootstrap.Glyphicon; const Glyphicon = ReactBootstrap.Glyphicon;
function backToIndex(){ function backToIndex() {
window.location = 'index.html'; window.location = 'index.html';
} }
@@ -64,8 +64,8 @@ var SettingsPage = React.createClass({
var teams_row = ( var teams_row = (
<Row> <Row>
<Col md={ 12 }> <Col md={ 12 }>
<h2>Teams</h2> <h2>Teams</h2>
<TeamList teams={ this.state.teams } onTeamsChange={ this.handleTeamsChange } /> <TeamList teams={ this.state.teams } onTeamsChange={ this.handleTeamsChange } />
</Col> </Col>
</Row> </Row>
); );
@@ -77,8 +77,8 @@ var SettingsPage = React.createClass({
var options_row = (options.length > 0) ? ( var options_row = (options.length > 0) ? (
<Row> <Row>
<Col md={ 12 }> <Col md={ 12 }>
<h2>Options</h2> <h2>Options</h2>
{ options } { options }
</Col> </Col>
</Row> </Row>
) : null; ) : null;
@@ -89,9 +89,9 @@ var SettingsPage = React.createClass({
{ options_row } { options_row }
<Row> <Row>
<Col md={ 12 }> <Col md={ 12 }>
<Button id="btnCancel" onClick={ this.handleCancel }>Cancel</Button> <Button id="btnCancel" onClick={ this.handleCancel }>Cancel</Button>
{ ' ' } { ' ' }
<Button id="btnSave" bsStyle="primary" onClick={ this.handleSave } disabled={ this.state.teams.length === 0 }>Save</Button> <Button id="btnSave" bsStyle="primary" onClick={ this.handleSave } disabled={ this.state.teams.length === 0 }>Save</Button>
</Col> </Col>
</Row> </Row>
</Grid> </Grid>