Merge branch 'develop' into newResourceLoader

Conflicts: includes/DefaultSettings.php kWidget/kWidget.js modules/AdSupport/resources/mw.AdLoader.js modules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js modules/KalturaSupport/download.php modules/KalturaSupport/kalturaIframe.php modules/KalturaSupport/loader.js modules/KalturaSupport/resources/mw.KWidgetSupport.js modules/KalturaSupport/tests/EmbedFlashembed.qunit.html modules/KalturaSupport/tests/kWidget.embed.qunit.html modules/KalturaSupport/uiConfComponents/faderPlugin.js modules/TimedText/resources/mw.TimedText.js resources/mediawiki/mediawiki.ajaxProxy.js
kaltura · Jul 5, 2012 · 723bb96 · 723bb96
2 parents 27b6e9e + 63aa2ed
commit 723bb96
Show file tree

Hide file tree

Showing 12 changed files with 371 additions and 281 deletions.
diff --git a/kWidget/kWidget.js b/kWidget/kWidget.js
@@ -275,7 +275,6 @@ var kWidget = {
 			this.extendJsListener( targetId );
 		}
 	},
-
 	/**
 	 * Destroy a kWidget embed instance
 	 * * removes the target from the dom
@@ -301,6 +300,7 @@ var kWidget = {
 		target.parentNode.removeChild( target );
 		target = null;
 	},
+
 	/**
 	 * Embeds the player from a set of on page objects with kEmbedSettings properties
 	 * @param {object} rewriteObjects set of in page object tags to be rewritten
@@ -645,7 +645,7 @@ var kWidget = {
 		return iframeRequest;
 	},
 	getIframeUrl: function(){
-		return SCRIPT_LOADER_URL.replace( 'load.php', 'mwEmbedFrame.php' );
+		return SCRIPT_LOADER_URL.replace( 'load.php', 'mwEmbedFrame.php' );
 	},
 	/**
 	 * Output an iframe without api. ( should rarely be used, this dissabe on page javascript api, 
@@ -1031,6 +1031,10 @@ var kWidget = {
 	 	if( !flashvars ){
 	 		flashvars= {};
 	 	}
+
+		if( ! swfUrl ) {
+			return {};
+		}
 
 	 	var trim = function ( str ) {
 	 		return str.replace(/^\s+|\s+$/g,"");
@@ -1313,10 +1317,15 @@ var kWidget = {
 						doEmbedSettingsWrite( kEmbedSettings, attributes.id, attributes.width, attributes.height);
 					} else {
 						// Use the original flash player embed:  
-						originalFlashembed( targetId, attributes, flashvars );
+						return originalFlashembed( targetId, attributes, flashvars );
 					}
 				});
 			};
+			// add static methods 
+			var flashembedStaticMethods = ['asString', 'getHTML', 'getVersion', 'isSupported'];
+			for(var i=0; i < flashembedStaticMethods.length; i++ ){
+				window['flashembed'][ flashembedStaticMethods[i] ] =originalFlashembed
+			} 
 		}
 
 		// SWFObject v 1.5 

diff --git a/modules/AdSupport/resources/mw.AdLoader.js b/modules/AdSupport/resources/mw.AdLoader.js
@@ -1,4 +1,3 @@
-
 ( function( mw, $ ) { "use strict";
 
 mw.AdLoader = {
@@ -44,6 +43,33 @@ mw.AdLoader = {
 			mw.log( "Error: mw.KAds : missing kaltura proxy url ( can't load ad )");
 			return ;
 		}
+		$.ajax({
+			url: proxyUrl + '?url=' + encodeURIComponent( adUrl ) + '&callback=?',
+			dataType: 'json',
+			success: function( result ){
+				var adDisplayConf = {};
+				if( result['http_code'] == 'ERROR' || result['http_code'] == 0 ){
+					mw.log("Error: loadAdXml error with http response");
+					callback(false);
+					return ;
+				}
+				try {
+					var resultXML = $.parseXML( result['contents'] );
+				} catch (e){
+					mw.log("Error: AdLoader could not parse:" + resultXML);
+					callback({});
+					return ;
+				}
+				// get the xml document:
+				_this.handleResult( resultXML, callback );
+			},
+			error: function( error ) {
+				mw.log("Error: AdLoader could not parse:" + error);
+				callback({});
+				return ;				
+			}
+		});
+		/*
 		$.getJSON( proxyUrl + '?url=' + encodeURIComponent( adUrl ) + '&callback=?', function( result ){
 			var adDisplayConf = {};
 			if( result['http_code'] == 'ERROR' || result['http_code'] == 0 ){
@@ -61,6 +87,7 @@ mw.AdLoader = {
 			// get the xml document:
 			_this.handleResult( resultXML, callback );
 		});
+		*/
 	},
 	handleResult: function(data, callback ){
 		var _this = this;

diff --git a/modules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js b/modules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
@@ -2771,4 +2771,4 @@ mw.PlayerControlBuilder.prototype = {
 };
 
 
-} )( window.mw, jQuery );
+} )( window.mw, jQuery );
diff --git a/modules/KalturaSupport/download.php b/modules/KalturaSupport/download.php
@@ -266,7 +266,7 @@ public function getSources(){
 		if( $kResultObject->getServiceConfig( 'UseManifestUrls' ) ){
 			foreach($this->sources as & $source ){
 				if( isset( $source['src'] )){
-					$source['src'] .= '?ks=' . $kResultObject->getKS() . '&referrer=' . base64_encode( $kResultObject->getReferer() );
+					$source['src'] .= '?ks=' . $kResultObject->getKS() . '&referrer=' . $this->getReferer();
 				}
 			}
 		}
@@ -280,6 +280,13 @@ public function getSources(){
 		//echo '<pre>'; print_r($sources); exit();
 		return $this->sources;
 	}
+	private function getReferer() {
+		if( isset($_GET['referrer']) ) {
+			return $_GET['referrer'];
+		} else {
+			return base64_encode( $this->getResultObject()->getReferer() );
+		}
+	}
 	public function getSourceForUserAgent(){
 
 		// Get user agent

diff --git a/modules/KalturaSupport/kalturaIframe.php b/modules/KalturaSupport/kalturaIframe.php
@@ -355,7 +355,7 @@ private function getEnvironmentConfig(){
 		// Flashvars
 		if( $this->getResultObject()->urlParameters[ 'flashvars' ] ) {
 			foreach( $this->getResultObject()->urlParameters[ 'flashvars' ]  as $fvKey => $fvValue) {
-				$configVars[  $fvKey ] =  json_decode( html_entity_decode( $fvValue ) );
+				$configVars[  $fvKey ] =  json_decode( html_entity_decode( $fvValue ) );
 			}
 		}
 		return $configVars;

diff --git a/modules/KalturaSupport/resources/mw.KWidgetSupport.js b/modules/KalturaSupport/resources/mw.KWidgetSupport.js
@@ -75,8 +75,10 @@ mw.KWidgetSupport.prototype = {
 
 			// Get KS and append to download url ( should be sync call )
 			var client = mw.kApiGetPartnerClient( embedPlayer.kwidgetid );
+			// Append ks & referrer for access control
+			var referrer = base64_encode( kWidgetSupport.getHostPageUrl() );
 			client.getKS(function( ks ){
-				downloadUrl += '/?ks=' + ks;
+				downloadUrl += '/?ks=' + ks + '&referrer=' + referrer;
 				downloadUrlCallback( downloadUrl );
 			});
 		});
@@ -346,6 +348,9 @@ mw.KWidgetSupport.prototype = {
 		};
 		// Add getFlashvars to embed player:
 		embedPlayer.getFlashvars = function( param ) {
+			if( ! embedPlayer.playerConfig || ! embedPlayer.playerConfig.vars ) {
+				return {};
+			}
 			var fv = embedPlayer.playerConfig['vars'] || {};
 			if ( param ) {
 				if ( param in fv ) {
@@ -732,7 +737,7 @@ mw.KWidgetSupport.prototype = {
 		if( embedPlayer.kreferenceid ) {
 			playerRequest.reference_id = embedPlayer.kreferenceid;
 		}
-
+
 		// Add the flashvars
 		playerRequest.flashvars = embedPlayer.getFlashvars();
 

diff --git a/modules/KalturaSupport/resources/uiConfComponents/faderPlugin.js b/modules/KalturaSupport/resources/uiConfComponents/faderPlugin.js
@@ -7,7 +7,8 @@
 
 	var faderPlugin = function( embedPlayer ){
 		if( embedPlayer.getKalturaConfig( 'target' ) == "{controllersVbox}" || 
-			embedPlayer.getKalturaConfig( 'target' ) == "{controlsHolder}" 
+			embedPlayer.getKalturaConfig( 'target' ) == "{controlsHolder}" ||
+			embedPlayer.getKalturaConfig( 'target' ) == "{controllerVertical}"
 		){
 			embedPlayer.overlaycontrols = true;
 		} else {

diff --git a/modules/KalturaSupport/tests/AdFlashvarVastDoubleClickCompanion.qunit.html b/modules/KalturaSupport/tests/AdFlashvarVastDoubleClickCompanion.qunit.html
@@ -254,4 +254,4 @@ <h2> VAST flashvar DoubleClick Ad and Companion </h2>
 </layout>
  -->
 </body>
-</html>
+</html>