Remove depracated calls (fixes #22) and fallback to open-project-root…

… when no file is open (partially handles #20)
karan · Jan 23, 2015 · 6528368 · 6528368
1 parent 3a7b930
commit 6528368
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/keymaps/atom-terminal.cson b/keymaps/atom-terminal.cson
@@ -7,6 +7,6 @@
 
 # For more detailed documentation see
 # https://atom.io/docs/latest/advanced/keymaps
-'.workspace':
+'atom-workspace':
     'ctrl-shift-t': 'atom-terminal:open'
     'alt-shift-t': 'atom-terminal:open-project-root'
diff --git a/lib/atom-terminal.coffee b/lib/atom-terminal.coffee
@@ -42,17 +42,19 @@ open_terminal = (dirpath) ->
 
 module.exports =
     activate: ->
-        atom.workspaceView.command "atom-terminal:open", => @open()
-        atom.workspaceView.command "atom-terminal:open-project-root", => @openroot()
+        atom.commands.add "atom-workspace", "atom-terminal:open", => @open()
+        atom.commands.add "atom-workspace", "atom-terminal:open-project-root", => @openroot()
     open: ->
         editor = atom.workspace.getActivePaneItem()
-        file = editor?.buffer.file
+        file = editor?.buffer?.file
         filepath = file?.path
         if filepath
             open_terminal path.dirname(filepath)
+        else
+            @openroot
+
     openroot: ->
-        if atom.project.path
-            open_terminal atom.project.path
+        open_terminal path for path in atom.project.getPaths()
 
 # Set per-platform defaults
 if platform() == 'darwin'