From 34bd103c3dfa24e90b0537a9bfe39775d47d1d8a Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Mon, 6 Oct 2014 13:19:47 -0600
Subject: [PATCH] Move remaining workspace commands back to $::command
 temporarily

---
 src/pane-element.coffee      | 46 ++++++++++++++++++++----------------
 src/workspace-element.coffee |  6 ++---
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/pane-element.coffee b/src/pane-element.coffee
index 77680b523..8b8a2feda 100644
--- a/src/pane-element.coffee
+++ b/src/pane-element.coffee
@@ -33,6 +33,32 @@ class PaneElement extends HTMLElement
   createSpacePenShim: ->
     @__spacePenView = new PaneView(this)
 
+    addCommands = (handlersByName) =>
+      for name, handler of handlersByName
+        do (handler) =>
+          @__spacePenView.command name, => handler.apply(this, arguments)
+
+    addCommands(
+      'pane:save-items': -> @getModel().saveItems()
+      'pane:show-next-item': -> @getModel().activateNextItem()
+      'pane:show-previous-item': -> @getModel().activatePreviousItem()
+      'pane:show-item-1': -> @getModel().activateItemAtIndex(0)
+      'pane:show-item-2': -> @getModel().activateItemAtIndex(1)
+      'pane:show-item-3': -> @getModel().activateItemAtIndex(2)
+      'pane:show-item-4': -> @getModel().activateItemAtIndex(3)
+      'pane:show-item-5': -> @getModel().activateItemAtIndex(4)
+      'pane:show-item-6': -> @getModel().activateItemAtIndex(5)
+      'pane:show-item-7': -> @getModel().activateItemAtIndex(6)
+      'pane:show-item-8': -> @getModel().activateItemAtIndex(7)
+      'pane:show-item-9': -> @getModel().activateItemAtIndex(8)
+      'pane:split-left': -> @getModel().splitLeft(copyActiveItem: true)
+      'pane:split-right': -> @getModel().splitRight(copyActiveItem: true)
+      'pane:split-up': -> @getModel().splitUp(copyActiveItem: true)
+      'pane:split-down': -> @getModel().splitDown(copyActiveItem: true)
+      'pane:close': -> @getModel().destroy()
+      'pane:close-other-items': -> @getModel().destroyInactiveItems()
+    )
+
   getModel: -> @model
 
   setModel: (@model) ->
@@ -82,26 +108,6 @@ class PaneElement extends HTMLElement
   hasFocus: ->
     this is document.activeElement or @contains(document.activeElement)
 
-atom.commands.add '.pane',
-  'pane:save-items': -> @getModel().saveItems()
-  'pane:show-next-item': -> @getModel().activateNextItem()
-  'pane:show-previous-item': -> @getModel().activatePreviousItem()
-  'pane:show-item-1': -> @getModel().activateItemAtIndex(0)
-  'pane:show-item-2': -> @getModel().activateItemAtIndex(1)
-  'pane:show-item-3': -> @getModel().activateItemAtIndex(2)
-  'pane:show-item-4': -> @getModel().activateItemAtIndex(3)
-  'pane:show-item-5': -> @getModel().activateItemAtIndex(4)
-  'pane:show-item-6': -> @getModel().activateItemAtIndex(5)
-  'pane:show-item-7': -> @getModel().activateItemAtIndex(6)
-  'pane:show-item-8': -> @getModel().activateItemAtIndex(7)
-  'pane:show-item-9': -> @getModel().activateItemAtIndex(8)
-  'pane:split-left': -> @getModel().splitLeft(copyActiveItem: true)
-  'pane:split-right': -> @getModel().splitRight(copyActiveItem: true)
-  'pane:split-up': -> @getModel().splitUp(copyActiveItem: true)
-  'pane:split-down': -> @getModel().splitDown(copyActiveItem: true)
-  'pane:close': -> @getModel().destroy()
-  'pane:close-other-items': -> @getModel().destroyInactiveItems()
-
 module.exports = PaneElement = document.registerElement 'atom-pane',
   prototype: PaneElement.prototype
   extends: 'div'
diff --git a/src/workspace-element.coffee b/src/workspace-element.coffee
index f7e14dbde..b33f81a9c 100644
--- a/src/workspace-element.coffee
+++ b/src/workspace-element.coffee
@@ -107,6 +107,9 @@ class WorkspaceElement extends HTMLElement
       'core:save-as': -> @getModel().saveActivePaneItemAs()
     )
 
+    if process.platform is 'darwin'
+      addCommands 'window:install-shell-commands': -> @getModel().installShellCommands()
+
   getModel: -> @model
 
   setModel: (@model) ->
@@ -135,9 +138,6 @@ class WorkspaceElement extends HTMLElement
   handleWindowFocus: (event) ->
     @handleFocus(event) if document.activeElement is document.body
 
-if process.platform is 'darwin'
-  atom.commands.add '.workspace', 'window:install-shell-commands', -> @getModel().installShellCommands()
-
 module.exports = WorkspaceElement = document.registerElement 'atom-workspace',
   prototype: WorkspaceElement.prototype
   extends: 'div'