From e201ecfd9b14cbc8be253fd118085a67865c768d Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Fri, 11 Nov 2011 16:45:54 -0800
Subject: [PATCH] paths are no more

---
 src/atom/app.coffee      |  4 ++--
 src/atom/browser.coffee  | 10 ++++-----
 src/atom/editor.coffee   | 48 ++++++++++++++++++++--------------------
 src/atom/project.coffee  |  4 ++--
 src/atom/resource.coffee |  2 +-
 src/atom/window.coffee   |  2 +-
 6 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/atom/app.coffee b/src/atom/app.coffee
index 3d3e718cc..2ba899ebc 100644
--- a/src/atom/app.coffee
+++ b/src/atom/app.coffee
@@ -1,7 +1,7 @@
 module.exports =
 class App
-  open: (path) ->
-    OSX.NSApp.open path
+  open: (url) ->
+    OSX.NSApp.open url
 
   quit: ->
     OSX.NSApp.terminate null
diff --git a/src/atom/browser.coffee b/src/atom/browser.coffee
index d066aab93..ab82d5b92 100644
--- a/src/atom/browser.coffee
+++ b/src/atom/browser.coffee
@@ -6,15 +6,15 @@ module.exports =
 class Browser extends Resource
   window.resourceTypes.push this
 
-  path: null
+  url: null
   html: $ "<div id='browser'></div>"
   iframe: ->
-    $ "<iframe src='#{@path}' style='width:100%;height:100%'></iframe>"
+    $ "<iframe src='#{@url}' style='width:100%;height:100%'></iframe>"
 
-  open: (path) ->
-    return false if not /^https?:/.test path
+  open: (url) ->
+    return false if not /^https?:/.test url
 
-    @path = path
+    @url = url
     @html.html @iframe().bind 'load', (e) =>
       window.setTitle e.target.contentWindow.document.title
 
diff --git a/src/atom/editor.coffee b/src/atom/editor.coffee
index f334d637d..352d6fe5c 100644
--- a/src/atom/editor.coffee
+++ b/src/atom/editor.coffee
@@ -12,7 +12,7 @@ class Editor extends Resource
   window.resourceTypes.push this
 
   dirty: false
-  path: null
+  url: null
   html: $ "<div id='ace-editor'></div>"
 
   constructor: ->
@@ -56,38 +56,38 @@ class Editor extends Resource
     Gemfile: 'ruby'
     Rakefile: 'ruby'
 
-  modeForPath: (path=@path) ->
-    return null if not path
+  setModeForSession: (session) ->
+    return if not @url
 
-    if not modeName = @modeFileMap[ _.last path.split '/' ]
-      language = _.last path.split '.'
+    if not modeName = @modeFileMap[ _.last url.split '/' ]
+      language = _.last url.split '.'
       language = language.toLowerCase()
       modeName = @modeMap[language] or language
 
     try
-      require("ace/mode/#{modeName}").Mode
+      mode = require("ace/mode/#{modeName}").Mode
+      session.setMode new mode
     catch e
-      null
+      console.error e
 
   title: ->
-    if @path then _.last @path.split '/' else 'untitled'
+    if @url then _.last @url.split '/' else 'untitled'
 
-  open: (path) ->
-    if path
-      return false if not fs.isFile path
-      return false if @path
+  open: (url) ->
+    if url
+      return false if not fs.isFile url
+      return false if @url
 
-    @path = path
+    @url = url
     @dirty = false
 
-    code = if @path then fs.read @path else ''
+    code = if @url then fs.read @url else ''
     session = @ace.getSession()
     session.setValue code
     session.setUseSoftTabs useSoftTabs = @usesSoftTabs code
     session.setTabSize if useSoftTabs then @guessTabSize code else 8
     session.setUndoManager new UndoManager
-    mode = @modeForPath()
-    session.setMode new mode if mode
+    @setModeForSession session
 
     window.setTitle @title()
 
@@ -95,8 +95,8 @@ class Editor extends Resource
 
   close: ->
     if @dirty
-      detailedMessage = if @path
-        "#{@path} has changes."
+      detailedMessage = if @url
+        "#{@url} has changes."
       else
         "An untitled file has changes."
 
@@ -111,18 +111,18 @@ class Editor extends Resource
     super
 
   save: ->
-    return @saveAs() if not @path
+    return @saveAs() if not @url
 
     @removeTrailingWhitespace()
-    fs.write @path, @code()
+    fs.write @url, @code()
     @dirty = false
 
-    @path
+    @url
 
   saveAs: ->
-    if path = atom.native.savePanel()?.toString()
-      @path = path
-      @save path
+    if url = atom.native.savePanel()?.toString()
+      @url = url
+      @save url
 
   code: ->
     @ace.getSession().getValue()
diff --git a/src/atom/project.coffee b/src/atom/project.coffee
index 68aa6bbe6..357f5d6be 100644
--- a/src/atom/project.coffee
+++ b/src/atom/project.coffee
@@ -10,8 +10,8 @@ class Project extends Resource
   html:
     $ '<img src="http://fc01.deviantart.net/fs70/f/2010/184/4/9/Neru_Troll_Face_by_nerutrollfaceplz.jpg">'
 
-  open: (path) ->
+  open: (url) ->
     return false if not fs.isDirectory url
 
-    @path = path
+    @url = url
     @show()
diff --git a/src/atom/resource.coffee b/src/atom/resource.coffee
index 5b30abb9a..a558f2b6c 100644
--- a/src/atom/resource.coffee
+++ b/src/atom/resource.coffee
@@ -6,7 +6,7 @@ Pane = require 'pane'
 module.exports =
 class Resource extends Pane
   position: "main"
-  path: null
+  url: null
 
   constructor: ->
 
diff --git a/src/atom/window.coffee b/src/atom/window.coffee
index 02be7a98d..dc752dd50 100644
--- a/src/atom/window.coffee
+++ b/src/atom/window.coffee
@@ -32,7 +32,7 @@ windowAdditions =
     url = atom.native.openPanel() unless url
     (@resource.open url) or atom.app.open url
 
-  close: (path) ->
+  close: (url) ->
     @shutdown()
     $atomController.close