From 4ee4862492c376526394e33c668a3d3b3e937895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 1 Dec 2021 11:07:00 +0100
Subject: [PATCH] MOBILE-3099 core: Remove fullheight loading component

---
 src/addons/mod/scorm/pages/player/player.html |  2 +-
 src/core/components/loading/loading.scss      |  5 +----
 .../capture-media/capture-media.html          |  2 +-
 .../features/viewer/pages/iframe/iframe.html  |  2 +-
 src/core/services/utils/dom.ts                | 22 +++++++++----------
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/addons/mod/scorm/pages/player/player.html b/src/addons/mod/scorm/pages/player/player.html
index 469a6bd01..f7f23bd11 100644
--- a/src/addons/mod/scorm/pages/player/player.html
+++ b/src/addons/mod/scorm/pages/player/player.html
@@ -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"
diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss
index c3cfbf655..3861b04e2 100644
--- a/src/core/components/loading/loading.scss
+++ b/src/core/components/loading/loading.scss
@@ -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;
diff --git a/src/core/features/emulator/components/capture-media/capture-media.html b/src/core/features/emulator/components/capture-media/capture-media.html
index f7be75b5c..f85e62a51 100644
--- a/src/core/features/emulator/components/capture-media/capture-media.html
+++ b/src/core/features/emulator/components/capture-media/capture-media.html
@@ -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>
diff --git a/src/core/features/viewer/pages/iframe/iframe.html b/src/core/features/viewer/pages/iframe/iframe.html
index 5b2ae550d..213a23e16 100644
--- a/src/core/features/viewer/pages/iframe/iframe.html
+++ b/src/core/features/viewer/pages/iframe/iframe.html
@@ -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>
diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts
index c23675e5c..77a664817 100644
--- a/src/core/services/utils/dom.ts
+++ b/src/core/services/utils/dom.ts
@@ -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) {