Merge branch 'master' into alpha38

This commit is contained in:
Adam Bradley
2015-10-06 20:38:12 -05:00
2 changed files with 8 additions and 0 deletions

View File

@@ -136,6 +136,10 @@ export class ItemSliding {
this.close();
this.didClose = true;
} else {
let openItem = this.list.getOpenItem();
if(openItem && openItem !== this) {
this.didClose = true;
}
if(this.list) {
this.list.closeOpenItem();
}

View File

@@ -77,8 +77,12 @@ export class List extends Ion {
closeOpenItem() {
if(this.openItem) {
this.openItem.close(true);
this.openItem = null;
}
}
getOpenItem() {
return this.openItem;
}
}
/**