EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3099 core: Remove fullheight loading component

main
Pau Ferrer Ocaña 2021-12-01 11:07:00 +01:00
parent a06f64832b
commit 4ee4862492
5 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addons/mod/scorm/pages/player/player.html
View File

@ -20,7 +20,7 @@
</ion-toolbar>
</ion-header>
<ion-content>
<core-loading [hideUntil]="loaded" class="core-loading-fullheight">
<core-loading [hideUntil]="loaded">
<core-navigation-bar [previous]="previousSco" [next]="nextSco" (action)="loadSco($event)"></core-navigation-bar>
<core-iframe *ngIf="loaded && src" [src]="src" [iframeWidth]="scormWidth" [iframeHeight]="scormHeight"

5
src/core/components/loading/loading.scss
View File

@ -44,6 +44,7 @@
}
.core-loading-content {
display: contents;
@include core-transition(opacity, 200ms);
}
@ -51,10 +52,6 @@
@include margin(10px, 0, 0, 0);
}
&.core-loading-fullheight .core-loading-content {
height: 100%;
}
&.core-loading-loaded {
position: unset;
display: contents;

2
src/core/features/emulator/components/capture-media/capture-media.html
View File

@ -11,7 +11,7 @@
</ion-toolbar>
</ion-header>
<ion-content>
<core-loading [hideUntil]="readyToCapture" class="core-loading-fullheight">
<core-loading [hideUntil]="readyToCapture">
<div class="core-av-wrapper">
<!-- Video stream for image and video. -->
<video *ngIf="!isAudio" [hidden]="hasCaptured" class="core-webcam-stream" autoplay #streamVideo></video>

2
src/core/features/viewer/pages/iframe/iframe.html
View File

@ -9,7 +9,7 @@
</ion-toolbar>
</ion-header>
<ion-content>
<core-loading [hideUntil]="finalUrl" class="core-loading-fullheight">
<core-loading [hideUntil]="finalUrl">
<core-iframe *ngIf="finalUrl" [src]="finalUrl"></core-iframe>
</core-loading>
</ion-content>

22
src/core/services/utils/dom.ts
View File

@ -975,7 +975,7 @@ export class CoreDomUtilsProvider {
* @deprecated since 3.9.5. Use directly the IonContent class.
*/
scrollTo(content: IonContent, x: number, y: number, duration?: number): Promise<void> {
return content?.scrollToPoint(x, y, duration || 0);
return content.scrollToPoint(x, y, duration || 0);
}
/**
@ -987,7 +987,7 @@ export class CoreDomUtilsProvider {
* @deprecated since 3.9.5. Use directly the IonContent class.
*/
scrollToBottom(content: IonContent, duration?: number): Promise<void> {
return content?.scrollToBottom(duration);
return content.scrollToBottom(duration);
}
/**
@ -999,7 +999,7 @@ export class CoreDomUtilsProvider {
* @deprecated since 3.9.5. Use directly the IonContent class.
*/
scrollToTop(content: IonContent, duration?: number): Promise<void> {
return content?.scrollToTop(duration);
return content.scrollToTop(duration);
}
/**
@ -1010,9 +1010,9 @@ export class CoreDomUtilsProvider {
*/
async getContentHeight(content: IonContent): Promise<number> {
try {
const scrollElement = await content?.getScrollElement();
const scrollElement = await content.getScrollElement();
return scrollElement?.clientHeight || 0;
return scrollElement.clientHeight || 0;
} catch (error) {
return 0;
}
@ -1026,9 +1026,9 @@ export class CoreDomUtilsProvider {
*/
async getScrollHeight(content: IonContent): Promise<number> {
try {
const scrollElement = await content?.getScrollElement();
const scrollElement = await content.getScrollElement();
return scrollElement?.scrollHeight || 0;
return scrollElement.scrollHeight || 0;
} catch (error) {
return 0;
}
@ -1042,9 +1042,9 @@ export class CoreDomUtilsProvider {
*/
async getScrollTop(content: IonContent): Promise<number> {
try {
const scrollElement = await content?.getScrollElement();
const scrollElement = await content.getScrollElement();
return scrollElement?.scrollTop || 0;
return scrollElement.scrollTop || 0;
} catch (error) {
return 0;
}
@ -1065,7 +1065,7 @@ export class CoreDomUtilsProvider {
return false;
}
content?.scrollToPoint(position[0], position[1], duration || 0);
content.scrollToPoint(position[0], position[1], duration || 0);
return true;
}
@ -1097,7 +1097,7 @@ export class CoreDomUtilsProvider {
return false;
}
content?.scrollToPoint(position[0], position[1], duration || 0);
content.scrollToPoint(position[0], position[1], duration || 0);
return true;
} catch (error) {