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

chore(): resolve merge conflicts

Browse Source
This commit is contained in:
Liam DeBeasi
2021-04-23 11:41:46 -04:00
parent d4e773623f dab927d290
commit aede8e686f
120 changed files with 21206 additions and 2546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/components/loading/readme.md
View File

@ -312,7 +312,7 @@ Developers can also use this component directly in their template:
cssClass="my-custom-class"
message="Please wait..."
:duration="timeout"
@onDidDismiss="setOpen(false)"
@didDismiss="setOpen(false)"
>
</ion-loading>
</template>

2
core/src/components/loading/usage/vue.md
View File

@ -63,7 +63,7 @@ Developers can also use this component directly in their template:
cssClass="my-custom-class"
message="Please wait..."
:duration="timeout"
@onDidDismiss="setOpen(false)"
@didDismiss="setOpen(false)"
>
</ion-loading>
</template>