mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
Merge branch 'master' into alpha38
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
@@ -77,8 +77,12 @@ export class List extends Ion {
|
||||
closeOpenItem() {
|
||||
if(this.openItem) {
|
||||
this.openItem.close(true);
|
||||
this.openItem = null;
|
||||
}
|
||||
}
|
||||
getOpenItem() {
|
||||
return this.openItem;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user