Merge branch 'master' into ns-telepathic-atom-global

Conflicts:
	src/atom.coffee
This commit is contained in:
Nathan Sobo
2013-12-16 18:18:06 -07:00
12 changed files with 115 additions and 45 deletions

View File

@@ -63,9 +63,6 @@ class Pane extends View
unless activeItemUri? and @showItemForUri(activeItemUri)
@showItem(@items[0]) if @items.length > 0
@command 'core:close', @destroyActiveItem
@command 'core:save', @saveActiveItem
@command 'core:save-as', @saveActiveItemAs
@command 'pane:save-items', @saveItems
@command 'pane:show-next-item', @showNextItem
@command 'pane:show-previous-item', @showPreviousItem