javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 19:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Content/list fix

Browse Source
This commit is contained in:
Max Lynch
2015-06-18 16:31:49 -05:00
parent 90b2931400
commit 2b2622b63b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ionic/components/aside/aside.js
View File

@ -53,10 +53,13 @@ export class Aside {
} }
getContentElement() { 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'); console.error('Aside: make sure to specify a content target using #var on the element');
return null; return null;
} }
if(this.content instanceof Node) {
return this.content;
}
return this.content.domElement; return this.content.domElement;
} }

2
ionic/components/list/list.js
View File

@ -27,9 +27,9 @@ export class List {
this.config = List.config.invoke(this); this.config = List.config.invoke(this);
setTimeout(() => { setTimeout(() => {
console.log('Content', this.content);
if(util.isDefined(this.virtual)) { if(util.isDefined(this.virtual)) {
console.log('Content', this.content);
console.log('Virtual?', this.virtual); console.log('Virtual?', this.virtual);
console.log('Items?', this.items.length, 'of \'em'); console.log('Items?', this.items.length, 'of \'em');
this._initVirtualScrolling(); this._initVirtualScrolling();