merge 2.49.rc3

includes/DefaultSettings.php

@@ -20,7 +20,7 @@
 $wgBaseMwEmbedPath = realpath( dirname( __FILE__ ) . '/../' );
 
 // The version of the library:
-$wgMwEmbedVersion = '2.49.rc2';
+$wgMwEmbedVersion = '2.49.rc3';
 
 // Default HTTP protocol from GET or SERVER parameters
 if( isset($_GET['protocol']) ) {

modules/Chromecast/resources/chromecast.js

@@ -27,7 +27,7 @@
 			'uiconfid':null,
 			'defaultConfig':true,
 			'disableSenderUI':false,
-			'defaultThumbnail': ''
+			'defaultThumbnail': null
 
 		},
 		isDisabled: false,
@@ -141,9 +141,9 @@
 						'entryId': _this.embedPlayer.kentryid
 					}
 				};
-				var proxyData = _this.embedPlayer.getKalturaConfig("proxyData");
-				if (proxyData && proxyData.data){
-					changeMediaMsg.data.proxyData = proxyData.data;
+				var proxyData = _this.getProxyData();
+				if (proxyData){
+					changeMediaMsg.data.proxyData = proxyData;
 				}
 				_this.sendMessage(changeMediaMsg);
 				_this.savedPosition = 0;
@@ -383,8 +383,30 @@
 				}
 			} );
 			// add support for custom proxyData for OTT app developers
+			var proxyData = this.getProxyData();
+			if(proxyData){
+				fv['proxyData'] = proxyData;
+			}
+
+			// add support for passing ks
+			if ( this.embedPlayer.getFlashvars( "ks" ) ) {
+				fv["ks"] = this.embedPlayer.getFlashvars( "ks" );
+			}
+			if (this.getConfig('defaultConfig')) {
+				fv['controlBarContainer'] = {hover: true};
+				fv['volumeControl'] = {plugin: false};
+				fv['titleLabel'] = {plugin: true};
+				fv['fullScreenBtn'] = {plugin: false};
+				fv['scrubber'] = {plugin: true};
+				fv['largePlayBtn'] = {plugin: true};
+			}
+			return fv;
+		},
+
+		getProxyData: function(){
 			var proxyData = this.getConfig( 'proxyData' );
 			if ( proxyData ) {
+				var _this = this;
 				var recursiveIteration = function ( object ) {
 					for ( var property in object ) {
 						if ( object.hasOwnProperty( property ) ) {
@@ -395,29 +417,15 @@
 							}
 						}
 					}
-				}
+				};
 				recursiveIteration( proxyData );
-				fv['proxyData'] = proxyData;
+				return proxyData;
 			} else {
-				var data  = _this.embedPlayer.getKalturaConfig('originalProxyData');
+				var data  = this.embedPlayer.getKalturaConfig('originalProxyData');
 				if (!$.isEmptyObject(data)) {
-					fv['proxyData'] = data;
+					return data;
 				}
 			}
-
-			// add support for passing ks
-			if ( this.embedPlayer.getFlashvars( "ks" ) ) {
-				fv["ks"] = this.embedPlayer.getFlashvars( "ks" );
-			}
-			if (this.getConfig('defaultConfig')) {
-				fv['controlBarContainer'] = {hover: true};
-				fv['volumeControl'] = {plugin: false};
-				fv['titleLabel'] = {plugin: true};
-				fv['fullScreenBtn'] = {plugin: false};
-				fv['scrubber'] = {plugin: true};
-				fv['largePlayBtn'] = {plugin: true};
-			}
-			return fv;
 		},
 
 		onLaunchError: function(error) {
@@ -881,7 +889,7 @@
 		},
 
 		getPlayingScreen: function(){
-			var thumbnail = this.getConfig('defaultThumbnail') !== "" ? this.getConfig('defaultThumbnail') : this.embedPlayer.poster;
+			var thumbnail = (this.getConfig('defaultThumbnail') !== null) ? this.getConfig('defaultThumbnail') : this.embedPlayer.poster;
 			return '<div class="chromecastScreen" style="background-color: rgba(0,0,0,0.7); width: 100%; height: 100%; font-family: Arial; position: absolute">' +
 				'<div class="chromecastPlayback">' +
 				'<div class="chromecastThumbBorder">' +

modules/Hlsjs/resources/hlsjs.js

@@ -2,7 +2,7 @@
 	"use strict";
 
 	//Currently use native support when available, e.g. Safari desktop
-	if (Hls.isSupported() && !mw.isDesktopSafari() && !mw.getConfig("disableHLSOnJs")) {
+	if (Hls.isSupported() && !mw.isNativeApp() && !mw.isDesktopSafari() && !mw.getConfig("disableHLSOnJs")) {
 		var orig_supportsFlash = mw.supportsFlash.bind(mw);
 		mw.supportsFlash = function () {
 			return false;

modules/KalturaSupport/UiConfResult.php

@@ -224,7 +224,9 @@ public function parseJSON( $uiConf ) {
 			//"playersJsReceiver" => array()
 		);
 
-		if(preg_match('/(?i)msie [5-8]/',$_SERVER['HTTP_USER_AGENT']))
+		$userAgent = $this->request->getUserAgent();
+
+		if(preg_match('/(?i)msie [5-8]/', $userAgent))
         {
             //On IE8 and below disable hlsjs if added
             if (isset($playerConfig['plugins']) &&

modules/KalturaSupport/resources/mw.KDPMapping.js

@@ -1257,6 +1257,8 @@
 						// Update the proxy data
 						embedPlayer.setKalturaConfig("proxyData", notificationData.proxyData);
 						embedPlayer.setKalturaConfig("proxyData", "data", notificationData.proxyData);
+						//Needed for changeMedia to keep base proxyData before server response is mixed into the object
+						embedPlayer.setKalturaConfig('originalProxyData', notificationData.proxyData);
 
 						// Clear player & entry meta
 						embedPlayer.kalturaPlayerMetaData = null;

resources/jquery.ui/jquery.ui.slider.js

@@ -168,15 +168,19 @@ $.widget( "ui.slider", $.ui.mouse, {
 		}
 
 		var outerWidth = this.element.outerWidth();
-			//IE11 iframe fullscreen fix (KMS-4606)
-		if( !mw.getConfig('EmbedPlayer.IsFriendlyIframe') && window["resizeScrubberIE11"] === true ){
-			outerWidth =  $(window).width();
+		var elemOffset = this.element.offset();
+		//IE11 iframe fullscreen fix (KMS-4606)
+		if( !mw.getConfig('EmbedPlayer.IsFriendlyIframe') && window["resizeScrubberIE11"] === true ) {
+			outerWidth = this.element.get(0).clientWidth;
+			var ieOffsetTop = elemOffset.top * 100;
+			var ieOffsetLeft = elemOffset.left * 100;
+			elemOffset = {left: ieOffsetLeft, top: ieOffsetTop};
 		}
 		this.elementSize = {
 			width:  outerWidth,
 			height: this.element.outerHeight()
 		};
-		this.elementOffset = this.element.offset();
+		this.elementOffset = elemOffset;
 
 		position = { x: event.pageX, y: event.pageY };
 		normValue = this._normValueFromMouse( position );