Merge branch 'master' of github.com:github/atom

Conflicts:
	static/command-panel.css
This commit is contained in:
Nathan Sobo
2012-05-08 15:11:27 -06:00
13 changed files with 76 additions and 46 deletions

View File

@@ -14,14 +14,14 @@ class TreeView extends View
requireStylesheet 'tree-view.css'
if state
@treeView = TreeView.deserialize(state, rootView)
@instance = TreeView.deserialize(state, rootView)
else
@treeView = new TreeView(rootView)
@instance = new TreeView(rootView)
rootView.horizontal.prepend(@treeView)
rootView.horizontal.prepend(@instance)
@serialize: ->
@treeView.serialize()
@instance.serialize()
@content: (rootView) ->
@div class: 'tree-view', tabindex: -1, =>