Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade all dependencies #68

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions elm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"type": "application",
"source-directories": [
"src"
],
"elm-version": "0.19.0",
"dependencies": {
"direct": {
"elm/browser": "1.0.1",
"elm/core": "1.0.2",
"elm/html": "1.0.0"
},
"indirect": {
"elm/json": "1.1.3",
"elm/time": "1.0.0",
"elm/url": "1.0.0",
"elm/virtual-dom": "1.0.2"
}
},
"test-dependencies": {
"direct": {},
"indirect": {}
}
}
17 changes: 11 additions & 6 deletions main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,14 @@ bugsnag.register('032040bba551785c7846442332cc067f', {
releaseStage: releaseStage
})

const shouldQuit = app.makeSingleInstance((commandLine, workingDirectory) => {
const shouldQuit = app.requestSingleInstanceLock()
app.on('second-instance', (event, commandLine, workingDirectory) => {
// Someone tried to run a second instance, we should focus our window.
if (displayManager) {
displayManager.showMain()
}
})
if (shouldQuit) {
if (!shouldQuit) {
app.exit()
}

Expand Down Expand Up @@ -191,7 +192,10 @@ function newTransparentOnTopWindow(
}

function onReady() {
app.dock.hide() // needed to support fullscreen mode in OS X, see https://github.com/electron/electron/issues/3302
// On Arch Linux with OpenBox, `app.dock` is `undefined`
if (app.dock) {
app.dock.hide() // needed to support fullscreen mode in OS X, see https://github.com/electron/electron/issues/3302
}
displayManager = new DisplayManager(
transparencyDisabled,
bugsnag,
Expand Down Expand Up @@ -323,14 +327,14 @@ function showStopTimerDialog() {
message: 'Stop the timer?',
cancelId: 1
})
if (dialogActionIndex === 1) {
dialogActionIndex.then(() => {
analytics.trackEventParams({
ec: 'stop-timer',
ea: 'cancel',
el: '',
ev: undefined
})
} else {
}).catch(() => {
closeTimer()
displayManager.showMain()
analytics.trackEventParams({
Expand All @@ -339,8 +343,9 @@ function showStopTimerDialog() {
el: '',
ev: undefined
})
}
})
} else {

displayManager.toggleMain()
}
dialogDisplayed = false
Expand Down
Loading