mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-01-20 08:33:11 +00:00
fix: modals not reacting after several uses
This commit is contained in:
committed by
Rainer Killinger
parent
848d2574c7
commit
f39c29f10b
@@ -39,7 +39,6 @@ export class OffersInListComponent {
|
|||||||
this.settingsProvider.getSetting('profile', 'group').then(group => {
|
this.settingsProvider.getSetting('profile', 'group').then(group => {
|
||||||
this.price =
|
this.price =
|
||||||
it[0].prices?.[(group.value as string).replace(/s$/, '') as never];
|
it[0].prices?.[(group.value as string).replace(/s$/, '') as never];
|
||||||
console.log(group.value);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,22 +20,7 @@
|
|||||||
<stapps-data-list-item
|
<stapps-data-list-item
|
||||||
[item]="dish"
|
[item]="dish"
|
||||||
[hideThumbnail]="true"
|
[hideThumbnail]="true"
|
||||||
[id]="'show-dish-in-modal-' + i"
|
|
||||||
></stapps-data-list-item>
|
></stapps-data-list-item>
|
||||||
<ion-modal
|
|
||||||
*ngIf="openAsModal"
|
|
||||||
[trigger]="'show-dish-in-modal-' + i"
|
|
||||||
swipe-to-close="true"
|
|
||||||
[presentingElement]="routerOutlet.nativeEl"
|
|
||||||
class="modal-large"
|
|
||||||
>
|
|
||||||
<ng-template>
|
|
||||||
<stapps-data-detail-content
|
|
||||||
[item]="dish"
|
|
||||||
[showModalHeader]="true"
|
|
||||||
></stapps-data-detail-content>
|
|
||||||
</ng-template>
|
|
||||||
</ion-modal>
|
|
||||||
</ng-container>
|
</ng-container>
|
||||||
</ion-list>
|
</ion-list>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -19,17 +19,6 @@
|
|||||||
[item]="$any(item)"
|
[item]="$any(item)"
|
||||||
id="show-more"
|
id="show-more"
|
||||||
></stapps-data-list-item>
|
></stapps-data-list-item>
|
||||||
<ion-modal
|
|
||||||
trigger="show-more"
|
|
||||||
[presentingElement]="routerOutlet.nativeEl"
|
|
||||||
canDismiss="true"
|
|
||||||
class="modal-large"
|
|
||||||
>
|
|
||||||
<ng-template>
|
|
||||||
<app-map-single-modal [item]="item" style="height: 100%">
|
|
||||||
</app-map-single-modal>
|
|
||||||
</ng-template>
|
|
||||||
</ion-modal>
|
|
||||||
<stapps-skeleton-list-item *ngIf="!item"></stapps-skeleton-list-item>
|
<stapps-skeleton-list-item *ngIf="!item"></stapps-skeleton-list-item>
|
||||||
</ion-card-header>
|
</ion-card-header>
|
||||||
<ion-card-content>
|
<ion-card-content>
|
||||||
@@ -39,19 +28,12 @@
|
|||||||
{{ address.streetAddress }}, {{ address.addressLocality }}
|
{{ address.streetAddress }}, {{ address.addressLocality }}
|
||||||
</span>
|
</span>
|
||||||
</ion-note>
|
</ion-note>
|
||||||
<ion-button size="small" id="show-more-button" fill="clear">{{
|
<ion-button
|
||||||
'map.page.buttons.MORE' | translate
|
size="small"
|
||||||
}}</ion-button>
|
class="show-more-button"
|
||||||
<ion-modal
|
fill="clear"
|
||||||
trigger="show-more-button"
|
[routerLink]="['/data-detail', item.uid]"
|
||||||
canDismiss="true"
|
>{{ 'map.page.buttons.MORE' | translate }}</ion-button
|
||||||
[presentingElement]="routerOutlet.nativeEl"
|
|
||||||
class="modal-large"
|
|
||||||
>
|
>
|
||||||
<ng-template>
|
|
||||||
<app-map-single-modal [item]="item" style="height: 100%">
|
|
||||||
</app-map-single-modal>
|
|
||||||
</ng-template>
|
|
||||||
</ion-modal>
|
|
||||||
</ion-card-content>
|
</ion-card-content>
|
||||||
</ion-card>
|
</ion-card>
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
|
|
||||||
#show-more-button {
|
.show-more-button {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -304,6 +304,8 @@ export class MapPageComponent {
|
|||||||
this.modalController.dismiss(),
|
this.modalController.dismiss(),
|
||||||
this.showItem(item.uid),
|
this.showItem(item.uid),
|
||||||
]);
|
]);
|
||||||
|
} else {
|
||||||
|
void this.router.navigate(['/data-detail', item.uid]);
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
this.positionService.watchCurrentLocation({maximumAge: 3000}).subscribe({
|
this.positionService.watchCurrentLocation({maximumAge: 3000}).subscribe({
|
||||||
|
|||||||
Reference in New Issue
Block a user