Merge pull request #4018 from dpalou/MOBILE-4566

Mobile 4566
moodlehq · Apr 24, 2024 · 718e1b1 · 718e1b1
2 parents bfd3752 + 1808d9a
commit 718e1b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/addons/filter/mediaplugin/services/videojs.ts b/src/addons/filter/mediaplugin/services/videojs.ts
@@ -165,6 +165,14 @@ export class AddonFilterMediaPluginVideoJSService {
         const videoWidth = player.videoWidth();
         const videoHeight = player.videoHeight();
         const playerDimensions = player.currentDimensions();
+        const offsetParentWidth = player.el().offsetParent?.clientWidth;
+
+        if (offsetParentWidth && playerDimensions.width > offsetParentWidth) {
+            // The player is bigger than the container. Resize it.
+            player.dimension('width', offsetParentWidth);
+            playerDimensions.width = offsetParentWidth;
+        }
+
         if (!videoWidth || !videoHeight || !playerDimensions.width || videoWidth === playerDimensions.width) {
             return;
         }

diff --git a/src/core/singletons/media.ts b/src/core/singletons/media.ts
@@ -54,7 +54,7 @@ export class CoreMedia {
      * @returns Whether needs conversion.
      */
     static sourceNeedsConversion(source: CoreMediaSource): boolean {
-        if (!CorePlatform.isIOS()) {
+        if (!CorePlatform.isMobile()) {
             return false;
         }
 
@@ -84,7 +84,7 @@ export class CoreMedia {
      * @returns Whether JS player should be used.
      */
     static mediaUsesJavascriptPlayer(mediaElement: HTMLVideoElement | HTMLAudioElement): boolean {
-        if (!CorePlatform.isIOS()) {
+        if (!CorePlatform.isMobile()) {
             return false;
         }