MOBILE-3099 core: Remove fullheight loading component
parent
a06f64832b
commit
4ee4862492
|
@ -20,7 +20,7 @@
|
||||||
</ion-toolbar>
|
</ion-toolbar>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
<ion-content>
|
<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-navigation-bar [previous]="previousSco" [next]="nextSco" (action)="loadSco($event)"></core-navigation-bar>
|
||||||
|
|
||||||
<core-iframe *ngIf="loaded && src" [src]="src" [iframeWidth]="scormWidth" [iframeHeight]="scormHeight"
|
<core-iframe *ngIf="loaded && src" [src]="src" [iframeWidth]="scormWidth" [iframeHeight]="scormHeight"
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.core-loading-content {
|
.core-loading-content {
|
||||||
|
display: contents;
|
||||||
@include core-transition(opacity, 200ms);
|
@include core-transition(opacity, 200ms);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,10 +52,6 @@
|
||||||
@include margin(10px, 0, 0, 0);
|
@include margin(10px, 0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
&.core-loading-fullheight .core-loading-content {
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.core-loading-loaded {
|
&.core-loading-loaded {
|
||||||
position: unset;
|
position: unset;
|
||||||
display: contents;
|
display: contents;
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
</ion-toolbar>
|
</ion-toolbar>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
<ion-content>
|
<ion-content>
|
||||||
<core-loading [hideUntil]="readyToCapture" class="core-loading-fullheight">
|
<core-loading [hideUntil]="readyToCapture">
|
||||||
<div class="core-av-wrapper">
|
<div class="core-av-wrapper">
|
||||||
<!-- Video stream for image and video. -->
|
<!-- Video stream for image and video. -->
|
||||||
<video *ngIf="!isAudio" [hidden]="hasCaptured" class="core-webcam-stream" autoplay #streamVideo></video>
|
<video *ngIf="!isAudio" [hidden]="hasCaptured" class="core-webcam-stream" autoplay #streamVideo></video>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
</ion-toolbar>
|
</ion-toolbar>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
<ion-content>
|
<ion-content>
|
||||||
<core-loading [hideUntil]="finalUrl" class="core-loading-fullheight">
|
<core-loading [hideUntil]="finalUrl">
|
||||||
<core-iframe *ngIf="finalUrl" [src]="finalUrl"></core-iframe>
|
<core-iframe *ngIf="finalUrl" [src]="finalUrl"></core-iframe>
|
||||||
</core-loading>
|
</core-loading>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
|
|
|
@ -975,7 +975,7 @@ export class CoreDomUtilsProvider {
|
||||||
* @deprecated since 3.9.5. Use directly the IonContent class.
|
* @deprecated since 3.9.5. Use directly the IonContent class.
|
||||||
*/
|
*/
|
||||||
scrollTo(content: IonContent, x: number, y: number, duration?: number): Promise<void> {
|
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.
|
* @deprecated since 3.9.5. Use directly the IonContent class.
|
||||||
*/
|
*/
|
||||||
scrollToBottom(content: IonContent, duration?: number): Promise<void> {
|
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.
|
* @deprecated since 3.9.5. Use directly the IonContent class.
|
||||||
*/
|
*/
|
||||||
scrollToTop(content: IonContent, duration?: number): Promise<void> {
|
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> {
|
async getContentHeight(content: IonContent): Promise<number> {
|
||||||
try {
|
try {
|
||||||
const scrollElement = await content?.getScrollElement();
|
const scrollElement = await content.getScrollElement();
|
||||||
|
|
||||||
return scrollElement?.clientHeight || 0;
|
return scrollElement.clientHeight || 0;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1026,9 +1026,9 @@ export class CoreDomUtilsProvider {
|
||||||
*/
|
*/
|
||||||
async getScrollHeight(content: IonContent): Promise<number> {
|
async getScrollHeight(content: IonContent): Promise<number> {
|
||||||
try {
|
try {
|
||||||
const scrollElement = await content?.getScrollElement();
|
const scrollElement = await content.getScrollElement();
|
||||||
|
|
||||||
return scrollElement?.scrollHeight || 0;
|
return scrollElement.scrollHeight || 0;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1042,9 +1042,9 @@ export class CoreDomUtilsProvider {
|
||||||
*/
|
*/
|
||||||
async getScrollTop(content: IonContent): Promise<number> {
|
async getScrollTop(content: IonContent): Promise<number> {
|
||||||
try {
|
try {
|
||||||
const scrollElement = await content?.getScrollElement();
|
const scrollElement = await content.getScrollElement();
|
||||||
|
|
||||||
return scrollElement?.scrollTop || 0;
|
return scrollElement.scrollTop || 0;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1065,7 +1065,7 @@ export class CoreDomUtilsProvider {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
content?.scrollToPoint(position[0], position[1], duration || 0);
|
content.scrollToPoint(position[0], position[1], duration || 0);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -1097,7 +1097,7 @@ export class CoreDomUtilsProvider {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
content?.scrollToPoint(position[0], position[1], duration || 0);
|
content.scrollToPoint(position[0], position[1], duration || 0);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|
Loading…
Reference in New Issue