From c2fe0b7aa1a4de2267b9ba451f9b4761559de7f0 Mon Sep 17 00:00:00 2001
From: probablycorey <cj@github.com>
Date: Thu, 13 Feb 2014 13:58:23 -0800
Subject: [PATCH] Replace `editor` with `item`

---
 src/workspace.coffee | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/workspace.coffee b/src/workspace.coffee
index efc99728e..8b8138b67 100644
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -97,34 +97,34 @@ class Workspace extends Model
     activatePane = options.activatePane ? options.changeFocus ? true
     uri = atom.project.relativize(uri) ? ''
 
-    editor = @activePane.itemForUri(uri)
+    item = @activePane.itemForUri(uri)
     if uri
-      editor ?= opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !editor
-    editor ?= atom.project.openSync(uri, {initialLine})
+      item ?= opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !item
+    item ?= atom.project.openSync(uri, {initialLine})
 
-    @activePane.activateItem(editor)
-    @itemOpened(editor)
+    @activePane.activateItem(item)
+    @itemOpened(item)
     @activePane.activate() if activatePane
-    editor
+    item
 
   openUriInPane: (uri, pane, options={}) ->
     changeFocus = options.changeFocus ? true
 
-    editor = pane.itemForUri(uri)
+    item = pane.itemForUri(uri)
     if uri
-      editor ?= opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !editor
-    editor ?= atom.project.open(uri, options)
+      item ?= opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !item
+    item ?= atom.project.open(uri, options)
 
-    Q(editor)
-      .then (editor) =>
+    Q(item)
+      .then (item) =>
         if not pane
-          pane = new Pane(items: [editor])
+          pane = new Pane(items: [item])
           @paneContainer.root = pane
-        @itemOpened(editor)
-        pane.activateItem(editor)
+        @itemOpened(item)
+        pane.activateItem(item)
         pane.activate() if changeFocus
         @emit "uri-opened"
-        editor
+        item
       .catch (error) ->
         console.error(error.stack ? error)