Merge pull request #4953 from avalonmediasystem/ios-fs-captions-bugfix

Fix for ios fullscreen captions not displaying
avalonmediasystem · Nov 15, 2022 · 03f4d3d · 03f4d3d
2 parents ce38462 + e1e3882
commit 03f4d3d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/views/modules/player/_video_element.html.erb b/app/views/modules/player/_video_element.html.erb
@@ -22,7 +22,9 @@ Unless required by applicable law or agreed to in writing, software distributed
                 height="<%= @player_height || 270 %>"
                 data-canvasindex=0
                 poster="<%= section_info[:poster_image] if f_start == 0 %>"
-                preload="auto">
+                preload="auto"
+                playsinline="true"
+                webkit-playsinline="true">
           <% section_info[:stream_hls].each do |hls| %>
             <source src="<%= hls[:url] %>" type="application/x-mpegURL" data-quality="<%= hls[:quality] %>"/>
           <% end %>

diff --git a/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js b/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
@@ -1300,7 +1300,7 @@ Object.assign(_player.config, {
 
 	fullscreenText: null,
 
-	useFakeFullscreen: false
+	useFakeFullscreen: true
 });
 
 Object.assign(_player2.default.prototype, {
@@ -1462,6 +1462,10 @@ Object.assign(_player2.default.prototype, {
 			t.setControlsSize();
 		}, 500);
 
+		if(_constants.IS_ANDROID || _constants.IS_IOS) {
+			t.getElement(t.container).querySelector('.' + t.options.classPrefix + 'overlay-button').style.display = 'none';
+		}
+
 		if (isNative) {
 			t.node.style.width = '100%';
 			t.node.style.height = '100%';