mirror of
https://github.com/atom/atom.git
synced 2026-02-12 23:55:10 -05:00
Merge branch 'master' of github.com:github/atom
Conflicts: static/command-panel.css
This commit is contained in:
@@ -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, =>
|
||||
|
||||
Reference in New Issue
Block a user