Skip to content

Commit

Permalink
Format
Browse files Browse the repository at this point in the history
  • Loading branch information
bcomnes committed May 15, 2018
1 parent 0134714 commit 8e4caa3
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions lib/sentry.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var raven = process.type === MAIN_THREAD ? require('raven') : require('raven-js'
var url = process.type === MAIN_THREAD ? `https://${RAVEN_A}:${RAVEN_B}@sentry.io/${RAVEN_C}` : `https://${RAVEN_A}@sentry.io/${RAVEN_C}`

if (process.type === MAIN_THREAD) {
// Main thread stuff only
// Main thread stuff only
process.on('uncaughtException', (err) => {
log.error(err)
const dialog = require('electron').dialog
Expand All @@ -52,7 +52,7 @@ The app may now quit - you can safely reopen it.`,
}

if (process.type === RENDERER) {
// Renderer stuff only
// Renderer stuff only
}

var sentry = raven.config(url, getopts(process.type)).install()
Expand Down
4 changes: 2 additions & 2 deletions main/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ viewMenu.splice(1, 0, {
viewMenu.push({
label: 'Show Audio Process',
accelerator: process.platform === 'darwin'
? 'Alt+Command+P'
: 'Ctrl+Shift+P',
? 'Alt+Command+P'
: 'Ctrl+Shift+P',
click: () => audio.toggleDevTools()
})

Expand Down
8 changes: 4 additions & 4 deletions renderer/player/elements/header/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,17 @@ class Header extends Component {
return html`
<header class="${styles.toolbar}">
<div class="${styles.toolbarLeft}">
${this.searchComp.render({
${this.searchComp.render({ /* eslint-disable indent */
onchange: this.handleSearch,
value: this.search
})}
})/* eslint-enable indent */}
</div>
<div class="${styles.toolbarRight}">
${button({
${button({ /* eslint-disable indent */
className: this.loading ? styles.spin : null,
onclick: this.handleAddButton,
iconName: this.loading ? 'entypo-cog' : 'entypo-folder-music'
})}
})/* eslint-enable indent */}
</div>
</header>
`
Expand Down
8 changes: 4 additions & 4 deletions renderer/player/elements/player/meta.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ class Meta extends Component {
${this.artwork.render(track.artwork)}
<div class=${styles.meta} onclick=${this.handleClick}>
${artist != null && artist !== '' && artist.length > 0
${artist != null && artist !== '' && artist.length > 0 /* eslint-disable indent */
? html`<div class=${styles.artist}>${Array.isArray(artist) ? artist.join(', ') : artist}</div>`
: ''}
${title != null
: ''/* eslint-enable indent */}
${title != null/* eslint-disable indent */
? html`<div class=${styles.title}>${title}</div>`
: html`<div>No Track Selected</div>`}
: html`<div>No Track Selected</div>`/* eslint-enable indent */}
</div>
</div>
`
Expand Down
4 changes: 2 additions & 2 deletions renderer/player/elements/player/progress.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ class Progress extends Component {
return html`
<div class=${styles.progress}>
<div class=${styles.time}>${fd(this.position * 1000)}</div>
${button({ className: styles.range },
${button({ className: styles.range }, /* eslint-disable indent */
this.positionSlider.render({
onchange: this.handleSeek,
value: currentTrack ? this.scalePosition(this.position, currentTrack.duration) : 0,
className: styles.scrubber,
disabled: this.disabled
})
)}
)/* eslint-enable indent */}
<div class=${styles.time}>${fd(this.duration * 1000)}</div>
</div>
`
Expand Down
4 changes: 2 additions & 2 deletions renderer/player/elements/player/volume.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class Volume extends Component {
this.emit = emit
return html`
<div class="${buttonStyles.btnGroup} ${styles.volumeGroup}">
${button({
${button({/* eslint-disable indent */
onclick: this.toggleMute,
iconName: muted ? 'entypo-sound-mute' : 'entypo-sound',
className: styles.volumeButton
Expand All @@ -79,7 +79,7 @@ class Volume extends Component {
value: volume,
className: styles.volumeSlider
})
)}
)/* eslint-enable indent */}
</div>
`
}
Expand Down
4 changes: 2 additions & 2 deletions renderer/player/elements/playlist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class Playlist extends Component {
return html`
<div class="${styles.playlist}">
${this.header.render(state, emit)}
${this.loading
${this.loading /* eslint-disable indent */
? loader()
: this.trackView.render(state, emit)}
: this.trackView.render(state, emit)/* eslint-enable indent */}
</div>
`
}
Expand Down
4 changes: 2 additions & 2 deletions renderer/player/pages/preferences.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ function preferences (state, emit) {
readonly="true">
</div>
</form>
${button({
${button({/* eslint-disable indent */
onclick: () => emit('pushState', '#'),
iconName: 'entypo-chevron-left'
}, 'Back')}
}, 'Back')/* eslint-disable indent */}
</div>
</div>
</div>
Expand Down
26 changes: 13 additions & 13 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ test('does the thing turn on?', t => {
app.start().catch(err => {
t.error(err, 'an error occured. uh oh')
})
.then(() => {
t.pass('the app started up')
return app.client.waitUntilWindowLoaded().getWindowCount()
})
.then(() => {
t.pass('the app started up')
return app.client.waitUntilWindowLoaded().getWindowCount()
})
// .then(count => {
// t.is(count, 4, 'there are 4 browser windows for some reason')
// })
.catch(err => {
t.error(err, 'an error occured. uh oh')
})
.then(() => {
app.stop()
})
.then(() => {
t.end()
})
.catch(err => {
t.error(err, 'an error occured. uh oh')
})
.then(() => {
app.stop()
})
.then(() => {
t.end()
})
})

test('pass', t => {
Expand Down

0 comments on commit 8e4caa3

Please sign in to comment.