'; + if(this.disp_item == 'upload') + selected_tab = inx++; } o+=''; //output the tab content containers: @@ -1087,31 +1108,36 @@ remoteSearchDriver.prototype = { }, /*set-up the control actions for clipEdit with relevent callbacks */ - getClipEditControlActions:function(){ + getClipEditControlActions:function( cp ){ var _this = this; - return { - 'insert' :function(rObj){ - _this.insertResource(rObj); - }, - 'preview':function(rObj){ + var cConf= {}; + + cConf['insert'] = function(rObj){ + _this.insertResource(rObj); + } + //if not directly inserting the resource is support a preview option: + if( _this.import_url_mode != 'remote_link'){ + cConf['preview'] = function(rObj){ _this.previewResource( rObj ) - }, - 'cancel' :function(){ - _this.cancelClipEditCB() - } - }; + }; + } + cConf['cancel'] = function(){ + _this.cancelClipEditCB() + } + return cConf; }, //loads the media editor: doMediaEdit:function( rObj , mediaType){ - var _this = this; + var _this = this; + var cp = rObj.pSobj.cp; var mvClipInit = { 'rObj':rObj, //the resource object - 'parent_ct':'rsd_modal_target', - 'clip_disp_ct':'clip_edit_disp', - 'control_ct': 'clip_edit_ctrl', - 'media_type': mediaType, - 'p_rsdObj': _this, - 'controlActionsCb':_this.getClipEditControlActions() + 'parent_ct' : 'rsd_modal_target', + 'clip_disp_ct' : 'clip_edit_disp', + 'control_ct' : 'clip_edit_ctrl', + 'media_type' : mediaType, + 'p_rsdObj' : _this, + 'controlActionsCb' : _this.getClipEditControlActions( cp ) }; var clibs = ['mvClipEdit']; @@ -1501,7 +1527,7 @@ remoteSearchDriver.prototype = { updatePreviewText:function( rObj ){ var _this = this; - if(_this.import_url_mode=='remote_link'){ + if( _this.import_url_mode == 'remote_link' ){ _this.cur_embed_code = rObj.pSobj.getEmbedHTML(rObj); }else{ _this.cur_embed_code = rObj.pSobj.getEmbedWikiCode( rObj ); diff --git a/js2/mwEmbed/libAddMedia/simpleUploadForm.js b/js2/mwEmbed/libAddMedia/simpleUploadForm.js new file mode 100644 index 0000000000..f1d493a719 --- /dev/null +++ b/js2/mwEmbed/libAddMedia/simpleUploadForm.js @@ -0,0 +1,86 @@ +/* + * simple form output jquery binding + * enables dynamic form output to a given target + * + */ + +loadGM({ + "select_file" : "Select File", + "more_licence_options" : "For more licence options view the normal upload page", + "select_ownwork" : "I am uploading entirely my own work, and licencing it under:", + "licence_cc-by-sa" : "Creative Commons Share Alike (3.0)", + "upload" : "Upload File", + "destfilename" : "Destination filename:", + "summary" : "Summary" +}); + +var default_form_options = { + 'enable_fogg' : true, + 'licence_options':['cc-by-sa'], + 'api_target' : false +}; + +(function($) { + $.fn.simpleUploadForm = function( opt , callback){ + //set the options: + for(var i in default_form_options){ + if(!opt[i]) + opt[i] = default_form_options[i]; + } + + //first do a reality check on the options: + if(!opt.api_target){ + $(this.selector).html('Error: Missing api target'); + return false; + } + + + //@@todo this is just a proof of concept + //much todo to improved this web form + var o = '

'+ + '

' + + '' + 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>';	
+			
+		//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');
+			} 			
+		});
+			
+		//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		
+		}			
+	}
+})(jQuery);
\ No newline at end of file
diff --git a/js2/mwEmbed/libClipEdit/mvClipEdit.js b/js2/mwEmbed/libClipEdit/mvClipEdit.js
index 83a7461a70..a2cf3eab48 100644
--- a/js2/mwEmbed/libClipEdit/mvClipEdit.js
+++ b/js2/mwEmbed/libClipEdit/mvClipEdit.js
@@ -83,7 +83,7 @@ mvClipEdit.prototype = {
 			this.doDisplayEdit();
 		}else{				
 			//check the media_type:
-			js_log('mvClipEdit:: media type:' + this.media_type + ' base width: ' + this.rObj.width + ' bh: ' + this.rObj.height);		
+			//js_log('mvClipEdit:: media type:' + this.media_type + ' base width: ' + this.rObj.width + ' bh: ' + this.rObj.height);		
 			//could seperate out into media Types objects for now just call method
 			if(this.media_type == 'image'){
 				this.setUpImageCtrl();
@@ -466,7 +466,7 @@ mvClipEdit.prototype = {
 		var b_target =   _this.p_rsdObj.target_container + '~ .ui-dialog-buttonpane';
 		//empty the ui-dialog-buttonpane bar:
 		$j(b_target).empty();
-		for(var cbType in _this.controlActionsCb){
+		for( var cbType in _this.controlActionsCb ){
 			switch(cbType){
 				case 'insert_seq':
 					$j(b_target).append( $j.btnHtml(gM('mv_insert_into_sequence'), 'mv_insert_sequence', 'check' ) + ' ' )
diff --git a/js2/mwEmbed/libEmbedVideo/embedVideo.js b/js2/mwEmbed/libEmbedVideo/embedVideo.js
index 49febb1968..5dc48244a7 100644
--- a/js2/mwEmbed/libEmbedVideo/embedVideo.js
+++ b/js2/mwEmbed/libEmbedVideo/embedVideo.js
@@ -156,7 +156,7 @@ mvEmbed = {
 		if( force_id == null && force_id != '' ){
 			var j_selector = 'video,audio,playlist';			   	
 		}else{
-			var j_selector = '#'+force_id;
+			var j_selector = '#' + force_id;
 		}
 		//process selected elements: 
 		//ie8 does not play well with the jQuery video,audio,playlist selector use native: 
@@ -2175,8 +2175,8 @@ embedVideo.prototype = {
 		
 		 $j("#mv_play_pause_button_" + this_id + ' span').removeClass('ui-icon-play').addClass('ui-icon-pause');			   
 		 $j("#mv_play_pause_button_" + this_id).unbind().btnBind().click(function(){					
-		   $j('#' + this_id ).get(0).pause();
-	   	  }).attr('title', gM('pause_clip'));
+		 	$j('#' + this_id ).get(0).pause();
+	   	 }).attr('title', gM('pause_clip'));
 		   
 	},
 	load:function(){
@@ -2393,7 +2393,7 @@ embedVideo.prototype = {
 			var val = parseInt( perc*1000 ); 
 			$j('#mv_play_head_'+this_id).slider('value', val);
 			
-			js_log("embed video set: " + '#mv_play_head_'+this_id + ' to ' + val);
+			//js_log("embed video set: " + '#mv_play_head_'+this_id + ' to ' + val);
 		}
 		//js_log('set#mv_seeker_slider_'+this_id + ' perc in: ' + perc + ' * ' + $j('#mv_seeker_'+this_id).width() + ' = set to: '+ val + ' - '+ Math.round(this.mv_seeker_width*perc) );
 		//js_log('op:' + offset_perc + ' *('+perc+' * ' + $j('#slider_'+id).width() + ')');
diff --git a/js2/mwEmbed/mv_embed.js b/js2/mwEmbed/mv_embed.js
index dc6c974d52..7ae89a9c25 100644
--- a/js2/mwEmbed/mv_embed.js
+++ b/js2/mwEmbed/mv_embed.js
@@ -150,13 +150,14 @@ lcPaths('',{
 	'$j.fn.datePicker'	: 'jquery/plugins/jquery.datePicker.js',
 	'$j.ui'				: 'jquery/jquery.ui-1.7.1/ui/ui.core.js',	
 	'$j.fn.ColorPicker'	: 'libClipEdit/colorpicker/js/colorpicker.js',
-	'$j.Jcrop'			: 'libClipEdit/Jcrop/js/jquery.Jcrop.js'
+	'$j.Jcrop'			: 'libClipEdit/Jcrop/js/jquery.Jcrop.js',
+	'$j.fn.simpleUploadForm': 'libAddMedia/simpleUploadForm.js'
 });	
 //query plugins
 lcPaths( 'jquery/plugins/', [
 	'$j.secureEvalJSON',	
 	'$j.cookie',
-	'$j.contextMenu',				
+	'$j.contextMenu'			
 ]);
 //jquery ui
 lcPaths('jquery/jquery.ui-1.7.1/ui/', [	
@@ -183,7 +184,7 @@ lcPaths('jquery/jquery.ui-1.7.1/ui/', [
 	'$j.effects.slide',
 	'$j.ui.accordion',
 	'$j.ui.draggable',
-	'$j.ui.selectable',
+	'$j.ui.selectable'
 ], 
 {'j_replace':''});
 //add mediaLibs
@@ -192,7 +193,7 @@ lcPaths('libAddMedia/', [
 	'mvAdvFirefogg',
     'mvBaseUploadInterface',
 	'remoteSearchDriver',
-	'seqRemoteSearchDriver',
+	'seqRemoteSearchDriver'	
 ]);
 //search libs: 
 lcPaths('libAddMedia/searchLibs/', [
@@ -1041,7 +1042,8 @@ function npt2seconds( npt_str ){
  * @param api_url 'optional' the target api url
  * @param callback the callback function to pass the token or "false" to  
  */
-function get_mw_token( title, api_url, callback){
+function get_mw_token( title, api_url, callback){	
+	js_log(':get_mw_token:');
 	if(!title && wgUserName){
 		title = 'User:' + wgUserName; 
 	}
diff --git a/js2/mwEmbed/mwHostProxy.html b/js2/mwEmbed/mwHostProxy.html
new file mode 100644
index 0000000000..48787c9b4e
--- /dev/null
+++ b/js2/mwEmbed/mwHostProxy.html
@@ -0,0 +1,14 @@
+<!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">
+	
+ 	</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/jsAutoloadLocalClasses.php b/js2/mwEmbed/php/jsAutoloadLocalClasses.php
index c7e0023b8a..326010314a 100644
--- a/js2/mwEmbed/php/jsAutoloadLocalClasses.php
+++ b/js2/mwEmbed/php/jsAutoloadLocalClasses.php
@@ -58,6 +58,7 @@ $wgJSAutoloadLocalClasses['j.ui.selectable']	= $wgMwEmbedDirectory . 'jquery/jqu
 // libAddMedia:
 $wgJSAutoloadLocalClasses['mvFirefogg'] 		= $wgMwEmbedDirectory . 'libAddMedia/mvFirefogg.js';
 $wgJSAutoloadLocalClasses['mvAdvFirefogg'] 		= $wgMwEmbedDirectory . 'libAddMedia/mvAdvFirefogg.js';
+$wgJSAutoloadLocalClasses['j.fn.simpleUploadForm']	= $wgMwEmbedDirectory . 'libAddMedia/simpleUploadForm.js';
 $wgJSAutoloadLocalClasses['mvBaseUploadInterface'] = $wgMwEmbedDirectory . 'libAddMedia/mvBaseUploadInterface.js';
 $wgJSAutoloadLocalClasses['remoteSearchDriver'] = $wgMwEmbedDirectory . 'libAddMedia/remoteSearchDriver.js';
 $wgJSAutoloadLocalClasses['seqRemoteSearchDriver'] = $wgMwEmbedDirectory . 'libAddMedia/seqRemoteSearchDriver.js';
diff --git a/js2/mwRemoteProxy.html b/js2/mwRemoteProxy.html
new file mode 100644
index 0000000000..7d66d13fc9
--- /dev/null
+++ b/js2/mwRemoteProxy.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title>Javascript Api Proxy</title>
+	<style type="text/css">
+		body{
+			font-size:80%;
+		}
+		img  {
+			border:medium none;
+		}
+	</style> 	 	 	
+ 	<script type="text/javascript">
+		var domainList = [
+			'127.0.0.1'
+		];
+ 	</script> 
+</head>
+<body>
+<h3> This file proxies api and html output for source domains: </h3>
+<div id="domainList"></div>
+	<script type="text/javascript">
+		var o='';
+		for( var i in domainList){
+			o+='<br><i>'+ domainList[i] + '</i>';
+		}
+	</script>
+</body>
+</html>
+
-- 
2.20.1