mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #6780 from electron/update-available-check

Browse source 
Mark update available until restart
This commit is contained in:
Cheng Zhao 2016-08-09 20:44:26 +09:00 • committed by GitHub
commit 01f92a83ab
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/browser/api/auto-updater/auto-updater-win.js
View file

@ -10,7 +10,7 @@ class AutoUpdater extends EventEmitter {
return this.emitError('No update available, can\'t quit and install')
}
squirrelUpdate.processStart()
return app.quit()
app.quit()
}
getFeedURL () {
@ -34,21 +34,17 @@ class AutoUpdater extends EventEmitter {
return this.emitError(error)
}
if (update == null) {
this.updateAvailable = false
return this.emit('update-not-available')
}
this.updateAvailable = true
this.emit('update-available')
squirrelUpdate.update(this.updateURL, (error) => {
var date, releaseNotes, version
if (error != null) {
return this.emitError(error)
}
releaseNotes = update.releaseNotes
version = update.version
// Following information is not available on Windows, so fake them.
date = new Date()
const {releaseNotes, version} = update
// Date is not available on Windows, so fake it.
const date = new Date()
this.emit('update-downloaded', {}, releaseNotes, version, date, this.updateURL, () => {
this.quitAndInstall()
})
@ -59,7 +55,7 @@ class AutoUpdater extends EventEmitter {
// Private: Emit both error object and message, this is to keep compatibility
// with Old APIs.
emitError (message) {
return this.emit('error', new Error(message), message)
this.emit('error', new Error(message), message)
}
}