Javascript Api Proxy

'+ - '

' + - '' + gM('select_file') + '
'+ - '
' + - '' +gM('destfilename') + '
'+ - '
'+ - '' + gM('summary') + ':
' + - '

<br>'+ 
-				gM('select_ownwork') + '<br>' + 
-			'<input type="checkbox" id="wpLicence" name="wpLicence" value="cc-by-sa">' + gM('licence_cc-by-sa') + '<br>' +			
-						
-			'<input type="submit" accesskey="s" value="' + gM('upload') + '" name="wpUploadBtn" id="wpUploadBtn"  tabindex="9"/>' +
-			//close the form and div  
-			'</form></div>';	
+		get_mw_token('File:MyRandomFileTokenCheck', opt.api_target, function(eToken){		
+			debugger;	
+			if( !eToken || eToken == '+\\' ){
+				$(this.selector).html( gM('error_not_loggedin') );
+				return false;
+			}
 			
-		//set the target with the form output:
-		$(this.selector).html( o );			
-		//by default dissable: 
-		$j('#wpUploadBtn').attr('disabled', 'disabled');
-		
-		//set up basic binding:
-		$j('#wpLicence').click(function(){
-			if( $j(this).is(':checked') ){
-				$j('#wpUploadBtn').removeAttr('disabled');				
-			}else{				
-				$j('#wpUploadBtn').attr('disabled', 'disabled');
-			} 			
-		});
+			var o = '<div style="margin: 0 auto;width:450px;">'+
+				'<form id="suf-upload" enctype="multipart/form-data" action="" method="post">'  +	
+				'<label for="wpUploadFile">' + gM('select_file') + '</label><br>'+									
+				'<input type="file" style="display: inline;" name="wpUploadFile" id="wpUploadFile" size="10"/><br>' +		
+				'<label for="wpDestFile">' +gM('destfilename') + '</label><br>'+
+					'<input type="text" id="wpDestFile" name="wpDestFile" size="30" /><br>'+
+				'<label for="wpUploadDescription">' + gM('summary') + ':</label><br>' +
+					'<textarea cols="30" rows="3" id="wpUploadDescription" name="wpUploadDescription" tabindex="3"/><br>'+ 
+					gM('select_ownwork') + '<br>' + 
+				'<input type="checkbox" id="wpLicence" name="wpLicence" value="cc-by-sa">' + gM('licence_cc-by-sa') + '<br>' +			
+							
+				'<input type="submit" accesskey="s" value="' + gM('upload') + '" name="wpUploadBtn" id="wpUploadBtn"  tabindex="9"/>' +
+				//close the form and div  
+				'</form></div>';		
+				
+			//set the target with the form output:
+			$( this.selector ).html( o );			
+			//by default dissable: 
+			$j('#wpUploadBtn').attr('disabled', 'disabled');
 			
-		//set up the binding per the config
-		if( opt.enable_fogg ){			
-			$j('#wpUploadFile').firefogg({ 
-				//an api url (we won't submit directly to action of the form)
-				'api_url' : opt.api_target,
-				'form_rewrite': true,	
-				'target_edit_from' : '#suf-upload',			
-				'new_source_cb' : function( orgFilename, oggName ){										        
-						$j('#wpDestFile').val( oggName );
-						//@@TODO: 
-						//mwUploadHelper.doDestCheck();
-				}
-			});		
-		}else{
-			//simple web form rewrite		
-		}		
+			//set up basic binding:
+			$j('#wpLicence').click(function(){
+				if( $j(this).is(':checked') ){
+					$j('#wpUploadBtn').removeAttr('disabled');				
+				}else{				
+					$j('#wpUploadBtn').attr('disabled', 'disabled');
+				} 			
+			});
+			
+			if(typeof opt.ondone_cb == 'undefined')
+				opt.ondone_cb = false;
+				
+			//set up the binding per the config
+			if( opt.enable_fogg ){
+				$j('#wpUploadFile').firefogg({ 
+					//an api url (we won't submit directly to action of the form)
+					'api_url' : opt.api_target,
+					'form_rewrite': true,	
+					'target_edit_from' : '#suf-upload',			
+					'new_source_cb' : function( orgFilename, oggName ){										        
+							$j('#wpDestFile').val( oggName );
+							//@@TODO: 
+							//mwUploadHelper.doDestCheck();
+					},
+					'done_upload_cb' : opt.ondone_cb
+				});		
+			}else{
+				//simple web form rewrite		
+			}
+		});			
 	}
 })(jQuery);
\ No newline at end of file
diff --git a/js2/mwEmbed/libClipEdit/colorpicker/js/colorpicker.js b/js2/mwEmbed/libClipEdit/colorpicker/js/colorpicker.js
index aec4dc8bac..3d0d25937c 100644
--- a/js2/mwEmbed/libClipEdit/colorpicker/js/colorpicker.js
+++ b/js2/mwEmbed/libClipEdit/colorpicker/js/colorpicker.js
@@ -6,7 +6,6 @@
  * Dual licensed under the MIT and GPL licenses
  * 
  */
- 
 (function ($) {
 	var ColorPicker = function () {
 		var
diff --git a/js2/mwEmbed/libSequencer/mvPlayList.js b/js2/mwEmbed/libSequencer/mvPlayList.js
index 0f80723e21..f0a7e8af62 100644
--- a/js2/mwEmbed/libSequencer/mvPlayList.js
+++ b/js2/mwEmbed/libSequencer/mvPlayList.js
@@ -2,10 +2,13 @@
  * the mvPlayList object code 
  * only included if playlist object found
  * 
- * part of mv_embed: 
- * http://metavid.org/wiki/index.php/Mv_embed 
+ * part of mwEmbed media projects see:  
+ * http://www.mediawiki.org/wiki/Media_Projects_Overview
+ * 
+ * @author: Michael Dale  mdale@wikimedia.org
+ * @license GPL2
  */
-var mv_default_playlist_attributes = {
+var mv_default_playlist_attributes = {	
 	//playlist attributes :
 	"id":null,
 	"title":null,
@@ -27,6 +30,7 @@ var MV_ANIMATION_CB_RATE = 33;
 //globals:
 //10 possible colors for clips: (can be in hexadecimal)
 var mv_clip_colors = new Array('aqua', 'blue', 'fuchsia', 'green', 'lime', 'maroon', 'navy', 'olive', 'purple', 'red');
+
 //the base url for requesting stream metadata 
 if(typeof wgServer=='undefined'){
 	var defaultMetaDataProvider = 'http://metavid.org/overlay/archive_browser/export_cmml?stream_name=';
@@ -1980,8 +1984,9 @@ var mv_smil_ref_supported_attributes = new Array(
 		'fill',
 		'dur',
 		'title',
-		
+		//some custom attributes:
 		'uri',			
+		'durationHint',
 		'poster'
 );
 /* extension to mvClip to support smil properties */
@@ -2039,7 +2044,10 @@ mvSMILClip.prototype = {
 		}		
 		//parse duration / begin times: 
 		if( this.dur )
-			this.dur = smilParseTime( this.dur );									
+			this.dur = smilParseTime( this.dur );		
+		//parse the media duration hint ( the source media length) 
+		if( this.durationHint )
+			this.durationHint = smilParseTime( this.durationHint );								
 		
 		//conform type to vido/ogg:
 		if( this.type == 'application/ogg' )
@@ -2077,7 +2085,7 @@ mvSMILClip.prototype = {
 		if( this.dur )
 			return this.dur;			
 		return this.embed.getDuration();					
-	},
+	},	
 	//gets the duration of the clip subracting transitions
 	getSoloDuration:function(){
 		var fulldur = this.getDuration();
@@ -2087,6 +2095,13 @@ mvSMILClip.prototype = {
 
 		//js_log("getSoloDuration:: td: " + this.getDuration() + ' sd:' + fulldur);
 		return fulldur;
+	},
+	//gets the duration of the original media asset (usefull for bounding setting of in-out-points)
+	getSourceDuration:function(){
+		if( this.durationHint )
+			return this.durationHint;
+		//if we have no source duration just return the media dur: 
+		return this.getDuration();
 	}
 }
 /*
diff --git a/js2/mwEmbed/mv_embed.js b/js2/mwEmbed/mv_embed.js
index f3b6666f97..eb167a84bb 100644
--- a/js2/mwEmbed/mv_embed.js
+++ b/js2/mwEmbed/mv_embed.js
@@ -232,8 +232,9 @@ lcPaths( 'libTimedText/', [
 
 //depencency mapping for css files for self contained included plugins:
 lcCssPath({
-	'$j.Jcrop'		: 'libClipEdit/Jcrop/css/jquery.Jcrop.css',
-	'$j.fn.ColorPicker': 'libClipEdit/colorpicker/css/colorpicker.css'
+	'$j.ui'				: 'jquery/' + jQueryUiVN + '.custom.css',
+	'$j.Jcrop'			: 'libClipEdit/Jcrop/css/jquery.Jcrop.css',
+	'$j.fn.ColorPicker'	: 'libClipEdit/colorpicker/css/colorpicker.css'
 })
 
 /**
@@ -1191,7 +1192,7 @@ function do_request(req_url, callback){
 		//prepend json_ to feed_format if not already requesting json format
 		if( req_url.indexOf("feed_format=")!=-1 &&  req_url.indexOf("feed_format=json")==-1)
 			req_url = req_url.replace(/feed_format=/, 'feed_format=json_');													
-		loadExternalJs(req_url+'&cb=mv_jsdata_cb&cb_inx='+(global_req_cb.length-1));			
+		loadExternalJs( req_url + '&cb=mv_jsdata_cb&cb_inx=' + (global_req_cb.length-1));			
 	}
 }
 
@@ -1238,7 +1239,7 @@ function mv_jsdata_cb(response){
 	global_req_cb[response['cb_inx']]( response['pay_load'] );
 }
 //load external js via dom injection
-function loadExternalJs( url ){
+function loadExternalJs( url, callback ){
 	  js_log('load js: '+ url);
 	//if(window['$j']) //use jquery call:	
 	   /*$j.ajax({
@@ -1251,11 +1252,13 @@ function loadExternalJs( url ){
 		var e = document.createElement("script");
 		e.setAttribute('src', url);
 		e.setAttribute('type',"text/javascript");
+		/*if(callback)
+			e.onload = callback;
+		*/
 		//e.setAttribute('defer', true);
-		document.getElementsByTagName("head")[0].appendChild(e);
+		document.getElementsByTagName("head")[0].appendChild(e);		
    // }
 }
-
 function styleSheetPresent(url){
 	style_elements = document.getElementsByTagName('link');
 	if( style_elements.length > 0) {
diff --git a/js2/mwEmbed/mwHostProxy.html b/js2/mwEmbed/mwHostProxy.html
new file mode 100644
index 0000000000..b02dbea0bb
--- /dev/null
+++ b/js2/mwEmbed/mwHostProxy.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title></title> 	 	 	
+ 	<script type="text/javascript">
+	/*
+	  XDCommsChild - Cross Domain Communication, Child Object.
+	
+	   Create this in the child window with the address of the xdomaincomms.html file on the same domain as the parent window
+	*/
+	var XDCommsChild = function(xdomaincommsAddress) {
+	    this.xdomaincommsAddress = xdomaincommsAddress;
+	
+	    this.isIe = isInternetExplorer();
+	
+	    if (isIe) {
+	        // need hidden frame for communication. IE8 is supposed to support postMessage, but I can't get it to work properly
+	        document.writeln("")
+	    }
+	
+	    this.postBack = function(data) {
+	        if (isIe) {
+	            // this method tested against IE6,7 & 8
+	            window.open(this.xdomaincommsAddress + '#data=' + data, 'xdcomms'); // MUST use window.open. frame.src or frame.location both fail
+	        } else {
+	            // for everything else - tested against Firefox 3, Chrome, Safari
+	            window.opener.postMessage(data, '*'); // should really restrict the domain data can come from here
+	        }
+	    }
+	
+	    this.postBackAndCloseWindow = function(data){
+	        this.postBack(data);
+	        setTimeout("window.close()", 200); // need to use a timeout to make sure the javascript in the frame has executed if we are using that communication model
+	    }
+	}
+ 	</script> 
+</head>
+<body>
+<h3> This file should be inclued by external sites that want to be proxied: </h3>
+</body>
+</html>
+
diff --git a/js2/mwEmbed/php/languages/mwEmbed.i18n.php b/js2/mwEmbed/php/languages/mwEmbed.i18n.php
index c009de5fab..c452374f64 100644
--- a/js2/mwEmbed/php/languages/mwEmbed.i18n.php
+++ b/js2/mwEmbed/php/languages/mwEmbed.i18n.php
@@ -41,6 +41,7 @@ $messages['en'] = array(
 	'ignorewarning' => 'Ignore warning and save file anyway',
 	'file-thumbnail-no' => 'The filename begins with <b><tt>$1</tt></b>',
 	'go-to-resource' => 'Go to Resource Page',
+	'upload-misc-error' => 'Unknown upload error',
 	'wgfogg_waring_bad_extension' => 'You have selected a file with an unsuported extension (<a href="http://commons.wikimedia.org/wiki/Commons:Firefogg#Supported_File_Types">more information</a>).',
 	'cancel-button' => 'Cancel',
 	'ok-button' => 'OK',

This file proxies api and html output for source domains:

Upload Completed: