removed ref to ResourceLoader.php replaced with load.php entry

point.
noam-arad · Mar 27, 2012 · bd0f963 · bd0f963
1 parent 43aeef6
commit bd0f963
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 760 deletions.
diff --git a/LocalSettings.KalturaPlatform.php b/LocalSettings.KalturaPlatform.php
@@ -33,7 +33,7 @@
 // Default Kaltura Cache Path
 $wgScriptCacheDirectory = $kConf->get('cache_root_path') . 'html5/' . $wgKalturaVersion;
 
-$wgResourceLoaderUrl = $wgKalturaServiceUrl . '/html5/html5lib/' . $wgKalturaVersion . '/ResourceLoader.php';
+$wgResourceLoaderUrl = $wgKalturaServiceUrl . '/html5/html5lib/' . $wgKalturaVersion . '/load.php';
 
 // Salt for proxy the user IP address to Kaltura API
 $wgKalturaRemoteAddressSalt = $kConf->get('remote_addr_header_salt');

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
@@ -157,11 +157,10 @@ protected function filter( $filter, $data ) {
 		try {
 			switch ( $filter ) {
 				case 'minify-js':
-					$result = $data;
-					/*$result = JavaScriptMinifier::minify( $data,
+					$result = JavaScriptMinifier::minify( $data,
 						$wgResourceLoaderMinifierStatementsOnOwnLine,
 						$wgResourceLoaderMinifierMaxLineLength
-					);*/
+					);
 					$result .= "\n\n/* cache key: $key */\n";
 					break;
 				case 'minify-css':

diff --git a/kWidget/README b/kWidget/README
@@ -0,0 +1,2 @@
+kWidget contains all client side code, it should not have any hard dependencies on mwEmbed framework 
+and is loaded for both html5 and flash.
diff --git a/kWidgetLoader.js → kWidget/kWidget.embed.js b/kWidgetLoader.js → kWidget/kWidget.embed.js
@@ -233,7 +233,7 @@ var kWidget = {
 	},
 
 	outputIframeWithoutApi: function( replaceTargetId, kEmbedSettings ) {
-		var iframeSrc = SCRIPT_LOADER_URL.replace( 'ResourceLoader.php', 'mwEmbedFrame.php' );
+		var iframeSrc = SCRIPT_LOADER_URL.replace( 'load.php', 'mwEmbedFrame.php' );
 		iframeSrc += '?' + kEmbedSettingsToUrl( kEmbedSettings );
 
 		// If remote service is enabled pass along service arguments:
@@ -305,7 +305,7 @@ var kWidget = {
 			options.width = 400;
 
 		// TODO: Add playEventUrl for stats
-		var baseUrl = SCRIPT_LOADER_URL.replace( 'ResourceLoader.php', '' );
+		var baseUrl = SCRIPT_LOADER_URL.replace( 'load.php', '' );
 		var downloadUrl = baseUrl + 'modules/KalturaSupport/download.php/wid/' + kEmbedSettings.wid;
 
 		// Also add the uiconf id to the url:

diff --git a/mwEmbedLoader.js → kWidget/kWidget.legacy.js b/mwEmbedLoader.js → kWidget/kWidget.legacy.js
@@ -233,7 +233,7 @@ function kCheckAddScript(){
 		! mw.getConfig( 'Kaltura.UiConfJsLoaded') && ! mw.getConfig('EmbedPlayer.IsIframeServer') ){
 		// We have not yet loaded uiConfJS... load it for each ui_conf id
 		var playerList = kGetKalturaPlayerList();
-		var baseUiConfJsUrl = SCRIPT_LOADER_URL.replace( 'ResourceLoader.php', 'services.php?service=uiconfJs');
+		var baseUiConfJsUrl = SCRIPT_LOADER_URL.replace( 'load.php', 'services.php?service=uiconfJs');
 		var requestCount = playerList.length -1;
 		for( var i=0;i < playerList.length; i++){
 			kAppendScriptUrl( baseUiConfJsUrl + kEmbedSettingsToUrl( playerList[i].kEmbedSettings), function(){

diff --git a/modules/KalturaSupport/kalturaIframe.php b/modules/KalturaSupport/kalturaIframe.php
@@ -453,7 +453,7 @@ private function sendPublicHeaders( $expireTime, $lastModified = null ){
 	 */
 	private function getMwEmbedLoaderLocation(){
 		global $wgResourceLoaderUrl;
-		$loaderPath = str_replace( 'ResourceLoader.php', 'mwEmbedLoader.php', $wgResourceLoaderUrl );
+		$loaderPath = str_replace( 'load.php', 'mwEmbedLoader.php', $wgResourceLoaderUrl );
 		$versionParam = '?';
 		$urlParam = $this->getResultObject()->getUrlParameters();
 		if( isset( $urlParam['urid'] ) ){
@@ -483,7 +483,7 @@ private function getMwEmbedLoaderLocation(){
 	 */
 	private function outputIframeHeadCss(){
 		global $wgResourceLoaderUrl;
-		$path = str_replace( 'ResourceLoader.php', '', $wgResourceLoaderUrl );
+		$path = str_replace( 'load.php', '', $wgResourceLoaderUrl );
 		?>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<title>Kaltura Embed Player iFrame</title>
@@ -575,7 +575,7 @@ private function outputIframeHeadCss(){
 	function outputIFrame( ){
 		//die( '<pre>' . htmlspecialchars($this->getVideoHTML()) );
 		global $wgResourceLoaderUrl;
-		$path = str_replace( 'ResourceLoader.php', '', $wgResourceLoaderUrl );
+		$path = str_replace( 'load.php', '', $wgResourceLoaderUrl );
 
 		// Check for plugins ( can overide output) 
 		$this->checkIframePlugins();
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		kWidget contains all client side code, it should not have any hard dependencies on mwEmbed framework
		and is loaded for both html5 and flash.