Merge branch 'master' into wl-electron-35

src/browser/application-menu.coffee

@@ -101,8 +101,6 @@ class ApplicationMenu
     downloadingUpdateItem.visible = false
     installUpdateItem.visible = false
 
-    return if @autoUpdateManager.isDisabled()
-
     switch state
       when 'idle', 'error', 'no-update-available'
         checkForUpdateItem.visible = true
@@ -117,9 +115,10 @@ class ApplicationMenu
   #
   # Returns an Array of menu item Objects.
   getDefaultTemplate: ->
-    template = [
+    [
       label: "Atom"
       submenu: [
+          {label: "Check for Update", metadata: {autoUpdate: true}}
           {label: 'Reload', accelerator: 'Command+R', click: => @focusedWindow()?.reload()}
           {label: 'Close Window', accelerator: 'Command+Shift+W', click: => @focusedWindow()?.close()}
           {label: 'Toggle Dev Tools', accelerator: 'Command+Alt+I', click: => @focusedWindow()?.toggleDevTools()}
@@ -127,10 +126,6 @@ class ApplicationMenu
       ]
     ]
 
-    # Add `Check for Update` button if autoUpdateManager is enabled.
-    template[0].submenu.unshift({label: "Check for Update", metadata: {autoUpdate: true}}) unless @autoUpdateManager.isDisabled()
-    template
-
   focusedWindow: ->
     _.find global.atomApplication.windows, (atomWindow) -> atomWindow.isFocused()
 

src/browser/atom-application.coffee

@@ -69,8 +69,7 @@ class AtomApplication
     @pidsToOpenWindows = {}
     @windows = []
 
-    disableAutoUpdate = require(path.join(@resourcePath, 'package.json'))._disableAutoUpdate ? false
-    @autoUpdateManager = new AutoUpdateManager(@version, options.test, disableAutoUpdate)
+    @autoUpdateManager = new AutoUpdateManager(@version, options.test, @resourcePath)
     @applicationMenu = new ApplicationMenu(@version, @autoUpdateManager)
     @atomProtocolHandler = new AtomProtocolHandler(@resourcePath, @safeMode)
 

src/browser/auto-update-manager.coffee

@@ -1,5 +1,6 @@
 autoUpdater = null
 _ = require 'underscore-plus'
+Config = require '../config'
 {EventEmitter} = require 'events'
 path = require 'path'
 
@@ -15,10 +16,13 @@ module.exports =
 class AutoUpdateManager
   _.extend @prototype, EventEmitter.prototype
 
-  constructor: (@version, @testMode, @disabled) ->
+  constructor: (@version, @testMode, resourcePath) ->
     @state = IdleState
     @iconPath = path.resolve(__dirname, '..', '..', 'resources', 'atom.png')
     @feedUrl = "https://atom.io/api/updates?version=#{@version}"
+    @config = new Config({configDirPath: process.env.ATOM_HOME, resourcePath, enablePersistence: true})
+    @config.setSchema null, {type: 'object', properties: _.clone(require('../config-schema'))}
+    @config.load()
     process.nextTick => @setupAutoUpdater()
 
   setupAutoUpdater: ->
@@ -46,9 +50,13 @@ class AutoUpdateManager
       @setState(UpdateAvailableState)
       @emitUpdateAvailableEvent(@getWindows()...)
 
-    # Only check for updates periodically if enabled and running in release
-    # version.
-    @scheduleUpdateCheck() unless /\w{7}/.test(@version) or @disabled
+    @config.onDidChange 'core.automaticallyUpdate', ({newValue}) =>
+      if newValue
+        @scheduleUpdateCheck()
+      else
+        @cancelScheduledUpdateCheck()
+
+    @scheduleUpdateCheck() if @config.get 'core.automaticallyUpdate'
 
     switch process.platform
       when 'win32'
@@ -56,9 +64,6 @@ class AutoUpdateManager
       when 'linux'
         @setState(UnsupportedState)
 
-  isDisabled: ->
-    @disabled
-
   emitUpdateAvailableEvent: (windows...) ->
     return unless @releaseVersion?
     for atomWindow in windows
@@ -74,10 +79,18 @@ class AutoUpdateManager
     @state
 
   scheduleUpdateCheck: ->
-    checkForUpdates = => @check(hidePopups: true)
-    fourHours = 1000 * 60 * 60 * 4
-    setInterval(checkForUpdates, fourHours)
-    checkForUpdates()
+    # Only schedule update check periodically if running in release version and
+    # and there is no existing scheduled update check.
+    unless /\w{7}/.test(@version) or @checkForUpdatesIntervalID
+      checkForUpdates = => @check(hidePopups: true)
+      fourHours = 1000 * 60 * 60 * 4
+      @checkForUpdatesIntervalID = setInterval(checkForUpdates, fourHours)
+      checkForUpdates()
+
+  cancelScheduledUpdateCheck: ->
+    if @checkForUpdatesIntervalID
+      clearInterval(@checkForUpdatesIntervalID)
+      @checkForUpdatesIntervalID = null
 
   check: ({hidePopups}={}) ->
     unless hidePopups