From 9224cae1a6e1626ff6244ae58a8c8af25c385fcf Mon Sep 17 00:00:00 2001
From: Michael Dale <dale@users.mediawiki.org>
Date: Wed, 12 Aug 2009 19:10:49 +0000
Subject: [PATCH] * (bug 20037) fixes script-loader loading of color picker 
 (grouped scripts ~usually~ need ; at the end of the last expression) * fixed
 select transition multiclip select issue * fixed poster attribute for "embed
 code"

---
 js2/mwEmbed/libClipEdit/colorpicker/js/colorpicker.js | 3 ++-
 js2/mwEmbed/libEmbedVideo/embedVideo.js               | 6 +++---
 js2/mwEmbed/libSequencer/mvSequencer.js               | 9 +++++----
 js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js        | 7 ++++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/js2/mwEmbed/libClipEdit/colorpicker/js/colorpicker.js b/js2/mwEmbed/libClipEdit/colorpicker/js/colorpicker.js
index 45f56ced7a..aec4dc8bac 100644
--- a/js2/mwEmbed/libClipEdit/colorpicker/js/colorpicker.js
+++ b/js2/mwEmbed/libClipEdit/colorpicker/js/colorpicker.js
@@ -6,6 +6,7 @@
  * Dual licensed under the MIT and GPL licenses
  * 
  */
+ 
 (function ($) {
 	var ColorPicker = function () {
 		var
@@ -481,4 +482,4 @@
 		ColorPickerShow: ColorPicker.showPicker,
 		ColorPickerSetColor: ColorPicker.setColor
 	});
-})(jQuery)
\ No newline at end of file
+})(jQuery);
\ No newline at end of file
diff --git a/js2/mwEmbed/libEmbedVideo/embedVideo.js b/js2/mwEmbed/libEmbedVideo/embedVideo.js
index e64aa67671..49febb1968 100644
--- a/js2/mwEmbed/libEmbedVideo/embedVideo.js
+++ b/js2/mwEmbed/libEmbedVideo/embedVideo.js
@@ -836,10 +836,10 @@ mediaElement.prototype =
 			this.tryAddSource(video_element);			  
 		
 		if($j(video_element).attr('thumbnail'))
-			this.thumbnail=$j(video_element).attr('thumbnail');
+			this.thumbnail = $j(video_element).attr('thumbnail');
 			
 		if($j(video_element).attr('poster'))
-			this.thumbnail=$j(video_element).attr('poster');
+			this.thumbnail = $j(video_element).attr('poster');
 			
 		// Process all inner <source> elements	
 		//js_log("inner source count: " + video_element.getElementsByTagName('source').length );
@@ -1851,7 +1851,7 @@ embedVideo.prototype = {
 			embed_code_html+='roe=&quot;'+this.roe+'&quot; &gt;';
 		}else{
 			embed_code_html+='src=&quot;'+this.src+'&quot; ' +
-				'thumbnail=&quot;'+embed_thumb_html+'&quot;&gt;';
+				'poster=&quot;'+embed_thumb_html+'&quot;&gt;';
 		}
 		//close the video tag
 		embed_code_html+='&lt;/video&gt;';
diff --git a/js2/mwEmbed/libSequencer/mvSequencer.js b/js2/mwEmbed/libSequencer/mvSequencer.js
index 62dba9bc6a..67eb04e624 100644
--- a/js2/mwEmbed/libSequencer/mvSequencer.js
+++ b/js2/mwEmbed/libSequencer/mvSequencer.js
@@ -745,9 +745,9 @@ mvSequencer.prototype = {
 		js_log("sequence:doEditTransition");
 		var _this = this;		
 		mv_get_loading_img( '#transitions_ic' );
-		mvJsLoader.doLoad([			
-			'mvTimedEffectsEdit',
-			'$j.fn.ColorPicker'
+		mvJsLoader.doLoad([		
+			'$j.fn.ColorPicker',
+			'mvTimedEffectsEdit'			
 		],function(){
 			//no idea why this works / is needed. 
 			var localSeqRef = _this;
@@ -1106,6 +1106,7 @@ mvSequencer.prototype = {
 						this_seq.deselectClip( $j(this).siblings('.mv_clip_thumb').get(0) );
 					}else{
 						//deselect others 
+						this_seq.deselectClip();
 						$j('.clip_trans_box').removeClass('mv_selected_transition');
 						$j(this).addClass("mv_selected_transition");
 						$j(this).siblings('.mv_clip_thumb').addClass("mv_selected_clip");	
@@ -1549,7 +1550,7 @@ mvSeqPlayList.prototype = {
 					
 				
 		//update the timeline playhead and			 
-		$j('#'+ this.seqObj.timeline_id + '_playline').css('left', left_px);
+		$j('#' + this.seqObj.timeline_id + '_playline').css('left', left_px);
 			
 		//pass update request to parent:
 		this.parent_setSliderValue( perc );
diff --git a/js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js b/js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js
index f4c7c91d38..8659e99ce0 100644
--- a/js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js
+++ b/js2/mwEmbed/libSequencer/mvTimedEffectsEdit.js
@@ -25,7 +25,8 @@ var default_timed_effect_values = {
 	'pSeq': null,	 //parent sequence Object
 	
 	'edit_action': null, //the requested edit action						
-}
+};
+
 var mvTimedEffectsEdit =function(iObj) {		
 	return this.init(iObj);
 };
@@ -249,7 +250,7 @@ mvTimedEffectsEdit.prototype = {
 		//and finally add effect timeline scrubber (for timed effects this also stores keyframes)
 				
 	},
-	getTransitionListControl:function(target_out){
+	getTransitionListControl : function(target_out){
 		js_log("getTransitionListControl");
 		var o= '<h3>Add a Transition:</h3>';
 		for(var type in mvTransLib['type']){
@@ -263,4 +264,4 @@ mvTimedEffectsEdit.prototype = {
 		}	
 		$j(target_out).html(o);
 	}		
-}
\ No newline at end of file
+};
-- 
2.20.1