Merge pull request #1347 from atom/chrome31

Update atom-shell to v0.8.x

build/Gruntfile.coffee

@@ -2,6 +2,10 @@ fs = require 'fs'
 path = require 'path'
 os = require 'os'
 
+# Add support for obselete APIs of vm module so we can make some third-party
+# modules work under node v0.11.x.
+require 'vm-compatibility-layer'
+
 fm = require 'json-front-matter'
 _ = require 'underscore-plus'
 

build/package.json

@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "biscotto": "0.0.17",
-    "first-mate": "~0.10.0",
+    "first-mate": "~0.13.0",
     "formidable": "~1.0.14",
     "github-releases": "~0.2.0",
     "grunt": "~0.4.1",
@@ -28,6 +28,7 @@
     "request": "~2.27.0",
     "rimraf": "~2.2.2",
     "unzip": "~0.1.9",
+    "vm-compatibility-layer": "~0.1.0",
     "walkdir": "0.0.7",
     "grunt-peg": "~1.1.0"
   }

package.json

@@ -16,7 +16,7 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.7.6",
+  "atomShellVersion": "0.8.5",
   "dependencies": {
     "async": "0.2.6",
     "bootstrap": "git://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
@@ -28,26 +28,27 @@
     "fs-plus": "0.14.0",
     "fstream": "0.1.24",
     "fuzzaldrin": "0.6.0",
-    "git-utils": "0.33.0",
+    "git-utils": "0.33.1",
     "guid": "0.0.10",
     "jasmine-tagged": "0.3.0",
     "mkdirp": "0.3.5",
-    "keytar": "0.13.0",
+    "keytar": "0.15.1",
     "less-cache": "0.10.0",
     "serializable": "0.3.0",
-    "nslog": "0.1.0",
+    "nslog": "0.3.0",
     "oniguruma": "0.26.0",
     "optimist": "0.4.0",
-    "pathwatcher": "0.11.0",
+    "pathwatcher": "0.14.2",
     "pegjs": "0.8.0",
     "q": "0.9.7",
-    "scandal": "0.12.0",
+    "scandal": "0.13.0",
     "season": "0.14.0",
     "semver": "1.1.4",
     "space-pen": "3.1.0",
     "temp": "0.5.0",
     "text-buffer": "0.13.0",
     "underscore-plus": "0.6.1",
+    "vm-compatibility-layer": "0.1.0",
     "theorist": "~0.14.0",
     "delegato": "~0.4.0",
     "mixto": "~0.4.0",
@@ -78,23 +79,23 @@
     "fuzzy-finder": "0.31.0",
     "gists": "0.15.0",
     "git-diff": "0.22.0",
-    "github-sign-in": "0.15.0",
+    "github-sign-in": "0.16.0",
     "go-to-line": "0.15.0",
     "grammar-selector": "0.17.0",
-    "image-view": "0.14.0",
+    "image-view": "0.15.0",
     "keybinding-resolver": "0.8.0",
-    "markdown-preview": "0.24.0",
+    "markdown-preview": "0.25.1",
     "metrics": "0.21.0",
     "package-generator": "0.24.0",
-    "release-notes": "0.15.0",
-    "settings-view": "0.56.0",
+    "release-notes": "0.15.1",
+    "settings-view": "0.56.1",
     "snippets": "0.19.0",
     "spell-check": "0.20.0",
     "status-bar": "0.32.0",
     "styleguide": "0.19.0",
     "symbols-view": "0.29.0",
     "tabs": "0.17.0",
-    "terminal": "0.23.0",
+    "terminal": "0.24.0",
     "timecop": "0.13.0",
     "to-the-hubs": "0.17.0",
     "tree-view": "0.61.0",

spec/git-spec.coffee

@@ -187,6 +187,7 @@ describe "Git", ->
       newPath = atom.project.resolve('git/working-dir/untracked.txt')
       cleanPath = atom.project.resolve('git/working-dir/other.txt')
       fs.writeFileSync(newPath, '')
+      newPath = fs.absolute newPath  # specs could be running under symbol path.
 
     afterEach ->
       fs.writeFileSync(modifiedPath, originalModifiedPathText)

src/atom.coffee

@@ -4,6 +4,7 @@ keytar = require 'keytar'
 os = require 'os'
 path = require 'path'
 remote = require 'remote'
+screen = require 'screen'
 shell = require 'shell'
 dialog = remote.require 'dialog'
 app = remote.require 'app'
@@ -207,10 +208,11 @@ class Atom extends Model
 
   # Private:
   restoreWindowDimensions: ->
+    workAreaSize = screen.getPrimaryDisplay().workAreaSize
     windowDimensions = @state.windowDimensions ? {}
     {initialSize} = @getLoadSettings()
-    windowDimensions.height ?= initialSize?.height ? global.screen.availHeight
-    windowDimensions.width ?= initialSize?.width ? Math.min(global.screen.availWidth, 1024)
+    windowDimensions.height ?= initialSize?.height ? workAreaSize.height
+    windowDimensions.width ?= initialSize?.width ? Math.min(workAreaSize.width, 1024)
     @setWindowDimensions(windowDimensions)
 
   # Private:

src/browser/main.coffee

@@ -2,7 +2,6 @@ global.shellStartTime = Date.now()
 
 autoUpdater = require 'auto-updater'
 crashReporter = require 'crash-reporter'
-delegate = require 'atom-delegate'
 app = require 'app'
 fs = require 'fs'
 module = require 'module'
@@ -24,7 +23,7 @@ process.on 'uncaughtException', (error={}) ->
   nslog(error.message) if error.message?
   nslog(error.stack) if error.stack?
 
-delegate.browserMainParts.preMainMessageLoopRun = ->
+start = ->
   args = parseCommandLine()
 
   addPathToOpen = (event, pathToOpen) ->
@@ -122,3 +121,5 @@ parseCommandLine = ->
     resourcePath = path.dirname(path.dirname(__dirname))
 
   {resourcePath, pathsToOpen, executedFrom, test, version, pidToKillWhenClosed, devMode, newWindow, specDirectory, logFile}
+
+start()

src/editor-view.coffee

@@ -668,7 +668,7 @@ class EditorView extends View
   #
   # fontSize - A {Number} indicating the font size in pixels.
   setFontSize: (fontSize) ->
-    @css('font-size', "#{fontSize}px}")
+    @css('font-size', "#{fontSize}px")
 
     @clearCharacterWidthCache()
 

static/index.html

@@ -5,10 +5,12 @@
 
   <script>
     window.onload = function() {
+      var path = require('path');
       var currentWindow = require('remote').getCurrentWindow();
       try {
+        require('vm-compatibility-layer');
         require('coffee-script');
-        require('../src/coffee-cache').register();
+        require(path.resolve(__dirname, '..', 'src', 'coffee-cache')).register();
         require(currentWindow.loadSettings.bootstrapScript);
         currentWindow.emit('window:loaded');
       }

vendor/apm

@@ -1 +1 @@
-Subproject commit 9f993c48b1ba3ccb9d8d1368286cccfbc079b618
+Subproject commit b843d54a8ac495231efd680ab3648dfd9247896c