From 2b2622b63bb9d5a09fa501402556fbbec2ec6dea Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Thu, 18 Jun 2015 16:31:49 -0500 Subject: [PATCH] Content/list fix --- ionic/components/aside/aside.js | 5 ++++- ionic/components/list/list.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ionic/components/aside/aside.js b/ionic/components/aside/aside.js index 0cfdea41c9..01043582a0 100644 --- a/ionic/components/aside/aside.js +++ b/ionic/components/aside/aside.js @@ -53,10 +53,13 @@ export class Aside { } getContentElement() { - if(!this.content || !this.content.domElement) { + if(!this.content && !this.content.domElement) { console.error('Aside: make sure to specify a content target using #var on the element'); return null; } + if(this.content instanceof Node) { + return this.content; + } return this.content.domElement; } diff --git a/ionic/components/list/list.js b/ionic/components/list/list.js index 15c7714bfb..ee6885da1d 100644 --- a/ionic/components/list/list.js +++ b/ionic/components/list/list.js @@ -27,9 +27,9 @@ export class List { this.config = List.config.invoke(this); setTimeout(() => { - console.log('Content', this.content); if(util.isDefined(this.virtual)) { + console.log('Content', this.content); console.log('Virtual?', this.virtual); console.log('Items?', this.items.length, 'of \'em'); this._initVirtualScrolling();