From 626ebe380e09935494d5d5c84e3d465f749d469b Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 6 Mar 2014 10:13:19 -0800 Subject: [PATCH 1/3] Use proper variable name --- src/browser/atom-application.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index ac0d13f4e..c0bfb247c 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -143,10 +143,10 @@ class AtomApplication autoUpdater.on 'update-available', => @applicationMenu.showDownloadingUpdateItem(true) - autoUpdater.on 'update-downloaded', (event, releaseNotes, releaseName, releaseDate, releaseURL) => - atomWindow.sendCommand('window:update-available', [releaseName, releaseNotes]) for atomWindow in @windows + autoUpdater.on 'update-downloaded', (event, releaseNotes, releaseVersion, releaseDate, releaseURL) => @applicationMenu.showInstallUpdateItem(true) - @updateVersion = releaseName + @updateVersion = releaseVersion + atomWindow.sendCommand('window:update-available', [releaseVersion, releaseNotes]) for atomWindow in @windows autoUpdater.on 'error', (event, message) => @applicationMenu.showCheckForUpdateItem(true) From 272dd4a0767ad47a79a7b058bff624e72648633a Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 6 Mar 2014 10:25:12 -0800 Subject: [PATCH 2/3] Don't trigger `window:update-available` on new windows This was causing people to see `undefined` release notes. In the future we can store the release notes, but since anything related to updates and the browser process takes a lot of time to fix I'm holding off on that improvement. --- src/browser/atom-application.coffee | 9 +-------- src/browser/atom-window.coffee | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index c0bfb247c..c96c20230 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -30,7 +30,6 @@ socketPath = module.exports = class AtomApplication _.extend @prototype, EventEmitter.prototype - updateVersion: null # Public: The entry point into the Atom application. @open: (options) -> @@ -144,9 +143,8 @@ class AtomApplication @applicationMenu.showDownloadingUpdateItem(true) autoUpdater.on 'update-downloaded', (event, releaseNotes, releaseVersion, releaseDate, releaseURL) => - @applicationMenu.showInstallUpdateItem(true) - @updateVersion = releaseVersion atomWindow.sendCommand('window:update-available', [releaseVersion, releaseNotes]) for atomWindow in @windows + @applicationMenu.showInstallUpdateItem(true) autoUpdater.on 'error', (event, message) => @applicationMenu.showCheckForUpdateItem(true) @@ -417,8 +415,3 @@ class AtomApplication promptForPath: ({devMode}={}) -> dialog.showOpenDialog title: 'Open', properties: ['openFile', 'openDirectory', 'multiSelections', 'createDirectory'], (pathsToOpen) => @openPaths({pathsToOpen, devMode}) - - # Public: If an update is available, it returns the new version string - # otherwise it returns null. - getUpdateVersion: -> - @updateVersion diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee index e153a166a..b844bc519 100644 --- a/src/browser/atom-window.coffee +++ b/src/browser/atom-window.coffee @@ -121,7 +121,6 @@ class AtomWindow if @loaded @focus() @sendCommand('window:open-path', {pathToOpen, initialLine}) - @sendCommand('window:update-available', global.atomApplication.getUpdateVersion()) if global.atomApplication.getUpdateVersion() else @browserWindow.once 'window:loaded', => @openPath(pathToOpen, initialLine) From 1dd59204e980a40cf40bb5e62469211870511753 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 6 Mar 2014 10:51:42 -0800 Subject: [PATCH 3/3] Only released versions should check for updates Fixes atom/release-notes#6 --- src/browser/atom-application.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee index c96c20230..e09428b25 100644 --- a/src/browser/atom-application.coffee +++ b/src/browser/atom-application.coffee @@ -129,6 +129,8 @@ class AtomApplication # Enable updates unless running from a local build of Atom. setupAutoUpdater: -> + return if /\w{7}/.test(@version) # Only released versions should check for updates. + autoUpdater.setFeedUrl "https://atom.io/api/updates?version=#{@version}" autoUpdater.on 'checking-for-update', =>