r72313 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r72312‎ \| r72313 \| r72314 >
Date:	21:16, 3 September 2010
Author:	dale
Status:	deferred
Tags:
Comment:	some fixes for group resource mode fixed horizontal scroll of clip list
Modified paths:	/branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsEdit.js (modified) (history) /branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js (modified) (history) /branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsView.js (modified) (history) /branches/MwEmbedStandAlone/modules/Sequencer/css/mw.style.Sequencer.css (modified) (history) /branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js (modified) (history) /branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerConfig.js (modified) (history) /branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerKeyBindings.js (modified) (history) /branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerRender.js (modified) (history) /branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTimeline.js (modified) (history) /branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js (modified) (history) /branches/MwEmbedStandAlone/modules/Sequencer/ui.layout/ui.layout-1.2.0.js (modified) (history) /branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js (modified) (history) /branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js (modified) (history) /branches/MwEmbedStandAlone/remotes/mediaWiki.js (modified) (history)

Diff [purge]

Index: branches/MwEmbedStandAlone/remotes/mediaWiki.js
—	—	@@ -4,7 +4,7 @@
5	5	*/
6	6	var urlparts = getRemoteEmbedPath();
7	7	var mwEmbedHostPath = urlparts[0];
8		~~-var mwRemoteVersion = 'r139';~~
	8	+var mwRemoteVersion = 'r142';
9	9	var mwUseScriptLoader = true;
10	10
11	11	// Log the mwRemote version makes it easy to debug cache issues
—	—	@@ -30,7 +30,6 @@
31	31	if( document.URL.indexOf( 'debug=true' ) !== -1 ){
32	32	mwReqParam['debug'] = true;
33	33	}
34		-
35	34	// Check if debug mode and disable script grouping
36	35	if( mwReqParam['debug'] ) {
37	36	mwUseScriptLoader = false;
—	—	@@ -102,7 +101,7 @@
103	102	window.ranMwRewrites = 'done';
104	103
105	104	// Add media wizard
106		~~- if ( ( wgAction == 'edit' && wgPageName.indexOf( "Sequence:" ) ) \|\| wgAction == 'submit' ) {~~
	105	+ if ( ( wgAction == 'edit' && wgPageName.indexOf( "Sequence:" ) ) \|\| wgAction == 'submit' ) {
107	106	loadMwEmbed( [
108	107	'mw.RemoteSearchDriver',
109	108	'mw.ClipEdit',
—	—	@@ -112,7 +111,7 @@
113	112	'$j.ui.sortable'
114	113	], function() {
115	114	mw.load( mwEmbedHostPath + '/remotes/AddMediaWizardEditPage.js?' + mwGetReqArgs() );
116		~~- } );~~
	115	+ } );
117	116	return ;
118	117	}
119	118
—	—	@@ -138,7 +137,7 @@
139	138	return ;
140	139	}
141	140	}
142		-
	141	+
143	142	// Remote Sequencer
144	143	if( wgPageName.indexOf( "Sequence:" ) === 0 ){
145	144	//console.log( 'spl: ' + typeof mwSetPageToLoading );
—	—	@@ -155,8 +154,9 @@
156	155	if( window.mwSequencerRemote ){
157	156	window.mwSequencerRemote.drawUI();
158	157	} else {
159		~~- loadMwEmbed( [ 'mw.MediaWikiRemoteSequencer', 'mw.style.SequencerRemote' ], function(){~~
160		~~- $j('#editform,.mw-newarticletext').hide();~~
	158	+ mwLoadPlayer(function(){
	159	+ // wait for wikieditor to do its thing
	160	+ $j('#editform,.mw-newarticletext,#toolbar').hide();
161	161	$j('.sequenceLoader').hide();
162	162
163	163	window.mwSequencerRemote = new mw.MediaWikiRemoteSequencer({
—	—	@@ -164,8 +164,10 @@
165	165	'title' : wgTitle,
166	166	'target' : '#bodyContent'
167	167	});
168		~~- window.mwSequencerRemote.drawUI();~~
169		~~- } );~~
	168	+ window.mwSequencerRemote.drawUI();
	169	+
	170	+ //setTimeout(function(){
	171	+ })
170	172	}
171	173
172	174	}
—	—	@@ -268,15 +270,17 @@
269	271	function mwLoadPlayer( callback ){
270	272
271	273	// The jsPlayerRequest includes both javascript and style sheets for the embedPlayer
272		~~- var jsPlayerRequest = [~~
273		~~- 'mw.EmbedPlayer',~~
274		~~- 'mw.style.EmbedPlayer',~~
	274	+ var jsPlayerRequest = [
275	275	'$j.ui',
276	276	'$j.widget',
277	277	'$j.ui.mouse',
	278	+
	279	+ '$j.cookie',
	280	+ 'mw.EmbedPlayer',
	281	+ 'mw.style.EmbedPlayer',
	282	+
278	283	'mw.PlayerControlBuilder',
279		~~- '$j.fn.hoverIntent',~~
280		~~- '$j.cookie',~~
	284	+ '$j.fn.hoverIntent',
281	285	'JSON',
282	286	'$j.ui.slider',
283	287
—	—	@@ -291,8 +295,11 @@
292	296	'mw.style.TimedText',
293	297
294	298	// mwSwarmTransport module
295		~~- 'mw.SwarmTransport'~~
	299	+ 'mw.SwarmTransport',
296	300
	301	+ // Sequencer remote:
	302	+ 'mw.MediaWikiRemoteSequencer',
	303	+ 'mw.style.SequencerRemote'
297	304	];
298	305	// Quick sniff use java if IE and native if firefox
299	306	// ( other browsers will run detect and get on-demand )
—	—	@@ -579,6 +586,8 @@
580	587	rurl += ',' + cName;
581	588	}
582	589	}
	590	+ // force add our updated version of $j.cookie
	591	+ rurl +=',$j.cookie';
583	592
584	593	// Add the remaining arguments
585	594	rurl += '&' + mwGetReqArgs();
Index: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
—	—	@@ -705,7 +705,7 @@
706	706	*/
707	707	panZoomLayout: function( smilElement, $target, img ){
708	708	var _this = this;
709		~~- mw.log( 'panZoomLayout:' + $j( smilElement).attr('id') );~~
	709	+ //mw.log( 'panZoomLayout:' + $j( smilElement).attr('id') );
710	710	var panZoom = $j( smilElement).attr('panZoom').split(',');
711	711	if( !img ){
712	712	var img = $j( '#' + this.smil.getSmilElementPlayerID( smilElement ) ).find('img').get(0);
—	—	@@ -731,7 +731,7 @@
732	732	}
733	733	// Get percent values
734	734	var percentValues = _this.smil.getAnimate().getPercentFromPanZoomValues( panZoom, natrualSize );
735		~~- mw.log('panZoomLayout::' + 'l:' + percentValues.left + ' t:' + percentValues.top + ' w:' + percentValues.width + ' h:' + percentValues.height );~~
	735	+ //mw.log('panZoomLayout::' + 'l:' + percentValues.left + ' t:' + percentValues.top + ' w:' + percentValues.width + ' h:' + percentValues.height );
736	736	// Update the layout via the animation engine updateElementLayout method
737	737	_this.smil.getAnimate().updateElementLayout( smilElement, percentValues, $target, img );
738	738	});
Index: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
—	—	@@ -435,7 +435,7 @@
436	436	// xxx need to refactor move to "smilLayout"
437	437	updateElementLayout: function( smilElement, percentValues, $target, htmlElement ){
438	438	var _this = this;
439		~~- mw.log("updateElementLayout::" + ' ' + percentValues.left + ' ' + percentValues.top + ' ' + percentValues.width + ' ' + percentValues.height );~~
	439	+ //mw.log("updateElementLayout::" + ' ' + percentValues.left + ' ' + percentValues.top + ' ' + percentValues.width + ' ' + percentValues.height );
440	440
441	441	// get a pointer to the html target:
442	442	if( !$target ) {
Index: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerConfig.js
—	—	@@ -6,38 +6,40 @@
7	7	* the mw.setConfig() method
8	8	*
9	9	*/
	10	+// Wrap in mw closure
	11	+( function( mw ) {
	12	+ // Define the class name
	13	+ mw.SequencerConfig = true;
	14	+
	15	+ mw.setDefaultConfig({
	16	+ // If the sequencer should attribute kaltura
	17	+ "Sequencer.KalturaAttribution" : true,
	18	+
	19	+ // If a the sequencer should open new windows
	20	+ "Sequencer.SpawnNewWindows" : true,
	21	+
	22	+ // If a the sequencer should include withJS=MediaWiki:mwEmbed in created urls
	23	+ "Sequencer.WithJsMwEmbedUrlHelper" : true,
	24	+
	25	+ // The size of the undo stack
	26	+ "Sequencer.NumberOfUndos" : 100,
	27	+
	28	+ // Default image duration
	29	+ "Sequencer.AddMediaImageDuration" : 2,
	30	+
	31	+ // Default image source width
	32	+ "Sequencer.AddMediaImageWidth" : 640,
	33	+
	34	+ // If a asset can be directly added to the sequence by url
	35	+ // ( if disabled only urls that are part addMedia can be added )
	36	+ "Sequencer.AddAssetByUrl" : true,
	37	+
	38	+ // Default timeline clip timeline track height
	39	+ "Sequencer.TimelineTrackHeight" : 100,
	40	+
	41	+ // Default timeline audio or collapsed timeline height
	42	+ "Sequencer.TimelineColapsedTrackSize" : 35
	43	+ });
10	44
11		~~-// Define the class name~~
12		~~-mw.SequencerConfig = true;~~
13		-
14		~~-mw.setDefaultConfig({~~
15		~~- // If the sequencer should attribute kaltura~~
16		~~- "Sequencer.KalturaAttribution" : true,~~
17		-
18		~~- // If a the sequencer should open new windows~~
19		~~- "Sequencer.SpawnNewWindows" : true,~~
20		-
21		~~- // If a the sequencer should include withJS=MediaWiki:mwEmbed in created urls~~
22		~~- // ( save gards ) against users that are 'trying' the~~
23		~~- "Sequencer.WithJsMwEmbedUrlHelper" : true,~~
24		-
25		~~- // The size of the undo stack~~
26		~~- "Sequencer.NumberOfUndos" : 100,~~
27		-
28		~~- // Default image duration~~
29		~~- "Sequencer.AddMediaImageDuration" : 2,~~
30		-
31		~~- // Default image source width~~
32		~~- "Sequencer.AddMediaImageWidth" : 640,~~
33		-
34		~~- // If a asset can be directly added to the sequence by url~~
35		~~- // ( if disabled only urls that are part addMedia can be added )~~
36		~~- "Sequencer.AddAssetByUrl" : true,~~
37		-
38		~~- // Default timeline clip timeline track height~~
39		~~- "Sequencer.TimelineTrackHeight" : 100,~~
40		-
41		~~- // Default timeline audio or collapsed timeline height~~
42		~~- "Sequencer.TimelineColapsedTrackSize" : 35~~
43		~~-})~~
	45	+} )( window.mw );
44	46
\ No newline at end of file
Index: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerKeyBindings.js
—	—	@@ -78,5 +78,4 @@
79	79	$j( _this ).trigger( 'delete' );
80	80	} );
81	81	}
82		-
83		-}
\ No newline at end of file
	82	+};
\ No newline at end of file
Index: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTimeline.js
—	—	@@ -64,9 +64,9 @@
65	65	this.trackLayout.resizeAll();
66	66	},
67	67	getTimelineContainerHeight: function(){
68		~~- var _this = this;~~
	68	+ var _this = this;
69	69	// Start with vertical space for one more track
70		~~- var timelineHeight = mw.getConfig( 'Sequencer.TimelineTrackHeight' );~~
	70	+ var timelineHeight = 60;
71	71	var smilSequenceTracks = this.sequencer.getSmil().getBody().getSeqElements();
72	72	$j.each(smilSequenceTracks, function( trackIndex, smilSequenceTrack ){
73	73	timelineHeight+= _this.getSequenceTrackHeight( smilSequenceTrack )
Index: branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
—	—	@@ -311,7 +311,7 @@
312	312	.append(
313	313	gM("mwe-sequencer-restore-text-edit", $j('<a />').click(function(){
314	314	$j('#sequencerContainer').hide();
315		~~- $j('#editform').show();~~
	315	+ $j('#editform,#toolbar').show();
316	316	}) )
317	317	)
318	318	.css( {'cursor': 'pointer', 'font-size':'x-small' })
—	—	@@ -486,7 +486,7 @@
487	487	'top' : '5px',
488	488	'bottom' : '5px',
489	489	'left' : '5px',
490		~~- 'right' : '5px',~~
	490	+ 'right' : '6px',
491	491	'background': '#FFF'
492	492	})
493	493	.append(
Index: branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
—	—	@@ -222,4 +222,4 @@
223	223	this.doneRenderCallback( this.fogg )
224	224	}
225	225	}
226		-}
\ No newline at end of file
	226	+};
\ No newline at end of file
Index: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerRender.js
—	—	@@ -62,4 +62,4 @@
63	63	}
64	64	})
65	65	}
66		-}
\ No newline at end of file
	66	+};
\ No newline at end of file
Index: branches/MwEmbedStandAlone/modules/Sequencer/css/mw.style.Sequencer.css
—	—	@@ -5,7 +5,6 @@
6	6	top: 4px;
7	7	left:4px;
8	8	right: 4px;
9		-
10	9	}
11	10
12	11	.mwe-sequencer .trackNameContainer{
—	—	@@ -13,6 +12,7 @@
14	13	}
15	14	.mwe-sequencer .clipTrackSetContainer{
16	15	overflow-x: scroll;
	16	+ overflow-y: hidden !important;
17	17	}
18	18
19	19	.mwe-sequencer .clipTrackSet{
Index: branches/MwEmbedStandAlone/modules/Sequencer/ui.layout/ui.layout-1.2.0.js
—	—	@@ -2503,5 +2503,5 @@
2504	2504	, cssHeight: cssH
2505	2505	};
2506	2506
2507		-}
	2507	+};
2508	2508	})( jQuery );
\ No newline at end of file
Index: branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsEdit.js
—	—	@@ -123,4 +123,4 @@
124	124	this.sequencer.getMenu().disableMenuItem( 'edit', 'redo' );
125	125	}
126	126	}
127		-}
\ No newline at end of file
	127	+};
\ No newline at end of file
Index: branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
—	—	@@ -512,4 +512,4 @@
513	513	}
514	514	);
515	515	}
516		-}
\ No newline at end of file
	516	+};
\ No newline at end of file
Index: branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsView.js
—	—	@@ -101,4 +101,4 @@
102	102
103	103	return formatted;
104	104	}
105		-}
	105	+};
\ No newline at end of file

Status & tagging log

04:39, 7 September 2010 😂 (talk | contribs) changed the status of r72313 [removed: new added: deferred]