Skip to content

Commit

Permalink
Merge branch 'release/v1.0.0-alpha'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kamil Mrzygłód committed Aug 7, 2017
2 parents d68079d + f68984e commit 89070ef
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
6 changes: 6 additions & 0 deletions app/actions/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,9 @@ export function notifyProgress(progress: ProgressInfo) {
type: PROGRESS, progress
};
}

export function clearErrors() {
return {
type: CLEAR_ERRORS
};
}
4 changes: 4 additions & 0 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ ipcRenderer.on('update-available', () => {
store.dispatch(layoutActions.alert('An update is being downloaded, please wait...', []));
});

ipcRenderer.on('update-not-available', () => {
store.dispatch(layoutActions.clearErrors());
});

ipcRenderer.on('update-progress', (event, progress) => {
store.dispatch(layoutActions.notifyProgress(progress));
});
1 change: 1 addition & 0 deletions app/updater.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default class Updater {
autoUpdater.on('error', err => mainWindow.webContents.send('update-error', err.toString()));
autoUpdater.on('checking-for-update', () => mainWindow.webContents.send('checking-for-update'));
autoUpdater.on('update-available', () => mainWindow.webContents.send('update-available'));
autoUpdater.on('update-not-available', () => mainWindow.webContents.send('update-not-available'));
autoUpdater.on('update-downloaded', () => autoUpdater.quitAndInstall());
autoUpdater.on('download-progress', (progress: ProgressInfo) => mainWindow.webContents.send('update-progress', progress));

Expand Down

0 comments on commit 89070ef

Please sign in to comment.