From 52c05eade771a779164a4ed0906a2f0b427b7f10 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Thu, 16 Oct 2014 16:48:56 -0700 Subject: [PATCH] Render proper atom-panels as children of containers --- spec/panel-container-element-spec.coffee | 2 ++ src/panel-element.coffee | 2 +- src/panel.coffee | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spec/panel-container-element-spec.coffee b/spec/panel-container-element-spec.coffee index 89dd64065..8279c9e19 100644 --- a/spec/panel-container-element-spec.coffee +++ b/spec/panel-container-element-spec.coffee @@ -50,6 +50,8 @@ describe "PanelContainerElement", -> container.addPanel(panel1) expect(element.childNodes.length).toBe 1 + expect(element.childNodes[0].tagName).toBe 'ATOM-PANEL' + panel2 = new Panel({viewRegistry, item: new TestPanelItem(), orientation: 'left'}) container.addPanel(panel2) expect(element.childNodes.length).toBe 2 diff --git a/src/panel-element.coffee b/src/panel-element.coffee index bf5f086ea..3fee9da0a 100644 --- a/src/panel-element.coffee +++ b/src/panel-element.coffee @@ -7,7 +7,7 @@ class PanelElement extends HTMLElement getModel: -> @model setModel: (@model) -> - @appendChild(@model.getView()) + @appendChild(@model.getItemView()) @subscriptions.add @model.onDidDestroy(@destroyed.bind(this)) destroyed: -> diff --git a/src/panel.coffee b/src/panel.coffee index 3ae8778bd..dc5e18939 100644 --- a/src/panel.coffee +++ b/src/panel.coffee @@ -9,7 +9,9 @@ class Panel destroy: -> @emitter.emit 'did-destroy', this - getView: -> @viewRegistry.getView(@item) + getView: -> @viewRegistry.getView(this) + + getItemView: -> @viewRegistry.getView(@item) ### Section: Event Subscription