Merge pull request #1037 from kaltura/FEC-2089-iPadFix

#FEC-2089 #comment fix regression (vid.load) + ipad with iOS8 dfp issue ...
kaltura · Oct 2, 2014 · 89b8370 · 89b8370
2 parents a10be0b + 03dc375
commit 89b8370
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/modules/DoubleClick/resources/mw.DoubleClick.js b/modules/DoubleClick/resources/mw.DoubleClick.js
@@ -297,9 +297,11 @@
 						return;
 					}
 					_this.embedPlayer.unbindHelper( 'playing' + bindPostFix );
-					_this.embedPlayer.stopEventPropagation();
-					_this.embedPlayer.getPlayerElement().pause();
-					_this.embedPlayer.stopMonitor();
+					if( !mw.isIOS8() ) {
+						_this.embedPlayer.stopEventPropagation();
+						_this.embedPlayer.getPlayerElement().pause();
+						_this.embedPlayer.stopMonitor();
+					}
 				});
 			}
 		},

diff --git a/modules/EmbedPlayer/resources/mw.EmbedPlayerNative.js b/modules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
@@ -1046,9 +1046,12 @@ mw.EmbedPlayerNative = {
 					// issue a play request
 					if( !_this.playing ) {
 						if( mw.isIOS8() ) {
-							vid.load();
+							setTimeout( function() {
+								vid.play();
+							}, 0);
+						} else {
+							vid.play();
 						}
-						vid.play();
 					}
 					// re-start the monitor:
 					_this.monitor();