http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72313
Revision: 72313
Author: dale
Date: 2010-09-03 21:16:36 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
some fixes for group resource mode
fixed horizontal scroll of clip list
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsEdit.js
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsView.js
branches/MwEmbedStandAlone/modules/Sequencer/css/mw.style.Sequencer.css
branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerConfig.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerKeyBindings.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerRender.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTimeline.js
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
branches/MwEmbedStandAlone/modules/Sequencer/ui.layout/ui.layout-1.2.0.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
branches/MwEmbedStandAlone/remotes/mediaWiki.js
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsEdit.js
===================================================================
---
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsEdit.js
2010-09-03 21:14:52 UTC (rev 72312)
+++
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsEdit.js
2010-09-03 21:16:36 UTC (rev 72313)
@@ -123,4 +123,4 @@
this.sequencer.getMenu().disableMenuItem( 'edit',
'redo' );
}
}
-}
\ No newline at end of file
+};
\ No newline at end of file
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
===================================================================
---
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
2010-09-03 21:14:52 UTC (rev 72312)
+++
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsSequence.js
2010-09-03 21:16:36 UTC (rev 72313)
@@ -512,4 +512,4 @@
}
);
}
-}
\ No newline at end of file
+};
\ No newline at end of file
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsView.js
===================================================================
---
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsView.js
2010-09-03 21:14:52 UTC (rev 72312)
+++
branches/MwEmbedStandAlone/modules/Sequencer/actions/mw.SequencerActionsView.js
2010-09-03 21:16:36 UTC (rev 72313)
@@ -101,4 +101,4 @@
return formatted;
}
-}
+};
\ No newline at end of file
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/css/mw.style.Sequencer.css
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/css/mw.style.Sequencer.css
2010-09-03 21:14:52 UTC (rev 72312)
+++ branches/MwEmbedStandAlone/modules/Sequencer/css/mw.style.Sequencer.css
2010-09-03 21:16:36 UTC (rev 72313)
@@ -5,7 +5,6 @@
top: 4px;
left:4px;
right: 4px;
-
}
.mwe-sequencer .trackNameContainer{
@@ -13,6 +12,7 @@
}
.mwe-sequencer .clipTrackSetContainer{
overflow-x: scroll;
+ overflow-y: hidden !important;
}
.mwe-sequencer .clipTrackSet{
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
2010-09-03 21:14:52 UTC (rev 72312)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
2010-09-03 21:16:36 UTC (rev 72313)
@@ -222,4 +222,4 @@
this.doneRenderCallback( this.fogg )
}
}
-}
\ No newline at end of file
+};
\ No newline at end of file
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerConfig.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerConfig.js
2010-09-03 21:14:52 UTC (rev 72312)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerConfig.js
2010-09-03 21:16:36 UTC (rev 72313)
@@ -6,38 +6,40 @@
* the mw.setConfig() method
*
*/
+// Wrap in mw closure
+( function( mw ) {
+ // Define the class name
+ mw.SequencerConfig = true;
+
+ mw.setDefaultConfig({
+ // If the sequencer should attribute kaltura
+ "Sequencer.KalturaAttribution" : true,
+
+ // If a the sequencer should open new windows
+ "Sequencer.SpawnNewWindows" : true,
+
+ // If a the sequencer should include withJS=MediaWiki:mwEmbed
in created urls
+ "Sequencer.WithJsMwEmbedUrlHelper" : true,
+
+ // The size of the undo stack
+ "Sequencer.NumberOfUndos" : 100,
+
+ // Default image duration
+ "Sequencer.AddMediaImageDuration" : 2,
+
+ // Default image source width
+ "Sequencer.AddMediaImageWidth" : 640,
+
+ // If a asset can be directly added to the sequence by url
+ // ( if disabled only urls that are part addMedia can be added
)
+ "Sequencer.AddAssetByUrl" : true,
+
+ // Default timeline clip timeline track height
+ "Sequencer.TimelineTrackHeight" : 100,
+
+ // Default timeline audio or collapsed timeline height
+ "Sequencer.TimelineColapsedTrackSize" : 35
+ });
-// Define the class name
-mw.SequencerConfig = true;
-
-mw.setDefaultConfig({
- // If the sequencer should attribute kaltura
- "Sequencer.KalturaAttribution" : true,
-
- // If a the sequencer should open new windows
- "Sequencer.SpawnNewWindows" : true,
-
- // If a the sequencer should include withJS=MediaWiki:mwEmbed in
created urls
- // ( save gards ) against users that are 'trying' the
- "Sequencer.WithJsMwEmbedUrlHelper" : true,
-
- // The size of the undo stack
- "Sequencer.NumberOfUndos" : 100,
-
- // Default image duration
- "Sequencer.AddMediaImageDuration" : 2,
-
- // Default image source width
- "Sequencer.AddMediaImageWidth" : 640,
-
- // If a asset can be directly added to the sequence by url
- // ( if disabled only urls that are part addMedia can be added )
- "Sequencer.AddAssetByUrl" : true,
-
- // Default timeline clip timeline track height
- "Sequencer.TimelineTrackHeight" : 100,
-
- // Default timeline audio or collapsed timeline height
- "Sequencer.TimelineColapsedTrackSize" : 35
-})
+} )( window.mw );
\ No newline at end of file
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerKeyBindings.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerKeyBindings.js
2010-09-03 21:14:52 UTC (rev 72312)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerKeyBindings.js
2010-09-03 21:16:36 UTC (rev 72313)
@@ -78,5 +78,4 @@
$j( _this ).trigger( 'delete' );
} );
}
-
-}
\ No newline at end of file
+};
\ No newline at end of file
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerRender.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerRender.js
2010-09-03 21:14:52 UTC (rev 72312)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerRender.js
2010-09-03 21:16:36 UTC (rev 72313)
@@ -62,4 +62,4 @@
}
})
}
-}
\ No newline at end of file
+};
\ No newline at end of file
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTimeline.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTimeline.js
2010-09-03 21:14:52 UTC (rev 72312)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerTimeline.js
2010-09-03 21:16:36 UTC (rev 72313)
@@ -64,9 +64,9 @@
this.trackLayout.resizeAll();
},
getTimelineContainerHeight: function(){
- var _this = this;
+ var _this = this;
// Start with vertical space for one more track
- var timelineHeight = mw.getConfig(
'Sequencer.TimelineTrackHeight' );
+ var timelineHeight = 60;
var smilSequenceTracks =
this.sequencer.getSmil().getBody().getSeqElements();
$j.each(smilSequenceTracks, function( trackIndex,
smilSequenceTrack ){
timelineHeight+= _this.getSequenceTrackHeight(
smilSequenceTrack )
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
===================================================================
---
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
2010-09-03 21:14:52 UTC (rev 72312)
+++
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
2010-09-03 21:16:36 UTC (rev 72313)
@@ -311,7 +311,7 @@
.append(
gM("mwe-sequencer-restore-text-edit", $j('<a
/>').click(function(){
$j('#sequencerContainer').hide();
- $j('#editform').show();
+ $j('#editform,#toolbar').show();
}) )
)
.css( {'cursor': 'pointer', 'font-size':'x-small' })
@@ -486,7 +486,7 @@
'top' : '5px',
'bottom' : '5px',
'left' : '5px',
- 'right' : '5px',
+ 'right' : '6px',
'background': '#FFF'
})
.append(
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/ui.layout/ui.layout-1.2.0.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/ui.layout/ui.layout-1.2.0.js
2010-09-03 21:14:52 UTC (rev 72312)
+++ branches/MwEmbedStandAlone/modules/Sequencer/ui.layout/ui.layout-1.2.0.js
2010-09-03 21:16:36 UTC (rev 72313)
@@ -2503,5 +2503,5 @@
, cssHeight: cssH
};
-}
+};
})( jQuery );
\ No newline at end of file
Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
2010-09-03 21:14:52 UTC (rev 72312)
+++ branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
2010-09-03 21:16:36 UTC (rev 72313)
@@ -435,7 +435,7 @@
// xxx need to refactor move to "smilLayout"
updateElementLayout: function( smilElement, percentValues, $target,
htmlElement ){
var _this = this;
- mw.log("updateElementLayout::" + ' ' + percentValues.left + ' '
+ percentValues.top + ' ' + percentValues.width + ' ' + percentValues.height );
+ //mw.log("updateElementLayout::" + ' ' + percentValues.left + '
' + percentValues.top + ' ' + percentValues.width + ' ' + percentValues.height
);
// get a pointer to the html target:
if( !$target ) {
Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
2010-09-03 21:14:52 UTC (rev 72312)
+++ branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
2010-09-03 21:16:36 UTC (rev 72313)
@@ -705,7 +705,7 @@
*/
panZoomLayout: function( smilElement, $target, img ){
var _this = this;
- mw.log( 'panZoomLayout:' + $j( smilElement).attr('id') );
+ //mw.log( 'panZoomLayout:' + $j( smilElement).attr('id') );
var panZoom = $j( smilElement).attr('panZoom').split(',');
if( !img ){
var img = $j( '#' + this.smil.getSmilElementPlayerID(
smilElement ) ).find('img').get(0);
@@ -731,7 +731,7 @@
}
// Get percent values
var percentValues =
_this.smil.getAnimate().getPercentFromPanZoomValues( panZoom, natrualSize );
- mw.log('panZoomLayout::' + 'l:' + percentValues.left +
' t:' + percentValues.top + ' w:' + percentValues.width + ' h:' +
percentValues.height );
+ //mw.log('panZoomLayout::' + 'l:' + percentValues.left
+ ' t:' + percentValues.top + ' w:' + percentValues.width + ' h:' +
percentValues.height );
// Update the layout via the animation engine
updateElementLayout method
_this.smil.getAnimate().updateElementLayout(
smilElement, percentValues, $target, img );
});
Modified: branches/MwEmbedStandAlone/remotes/mediaWiki.js
===================================================================
--- branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-03 21:14:52 UTC
(rev 72312)
+++ branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-03 21:16:36 UTC
(rev 72313)
@@ -4,7 +4,7 @@
*/
var urlparts = getRemoteEmbedPath();
var mwEmbedHostPath = urlparts[0];
-var mwRemoteVersion = 'r139';
+var mwRemoteVersion = 'r142';
var mwUseScriptLoader = true;
// Log the mwRemote version makes it easy to debug cache issues
@@ -30,7 +30,6 @@
if( document.URL.indexOf( 'debug=true' ) !== -1 ){
mwReqParam['debug'] = true;
}
-
// Check if debug mode and disable script grouping
if( mwReqParam['debug'] ) {
mwUseScriptLoader = false;
@@ -102,7 +101,7 @@
window.ranMwRewrites = 'done';
// Add media wizard
- if ( ( wgAction == 'edit' && wgPageName.indexOf( "Sequence:" ) ) ||
wgAction == 'submit' ) {
+ if ( ( wgAction == 'edit' && wgPageName.indexOf( "Sequence:" ) ) ||
wgAction == 'submit' ) {
loadMwEmbed( [
'mw.RemoteSearchDriver',
'mw.ClipEdit',
@@ -112,7 +111,7 @@
'$j.ui.sortable'
], function() {
mw.load( mwEmbedHostPath +
'/remotes/AddMediaWizardEditPage.js?' + mwGetReqArgs() );
- } );
+ } );
return ;
}
@@ -138,7 +137,7 @@
return ;
}
}
-
+
// Remote Sequencer
if( wgPageName.indexOf( "Sequence:" ) === 0 ){
//console.log( 'spl: ' + typeof mwSetPageToLoading );
@@ -155,8 +154,9 @@
if( window.mwSequencerRemote ){
window.mwSequencerRemote.drawUI();
} else {
- loadMwEmbed( [ 'mw.MediaWikiRemoteSequencer',
'mw.style.SequencerRemote' ], function(){
-
$j('#editform,.mw-newarticletext').hide();
+ mwLoadPlayer(function(){
+ // wait for wikieditor to do its thing
+
$j('#editform,.mw-newarticletext,#toolbar').hide();
$j('.sequenceLoader').hide();
window.mwSequencerRemote = new
mw.MediaWikiRemoteSequencer({
@@ -164,8 +164,10 @@
'title' : wgTitle,
'target' : '#bodyContent'
});
- window.mwSequencerRemote.drawUI();
- } );
+ window.mwSequencerRemote.drawUI();
+
+ //setTimeout(function(){
+ })
}
}
@@ -268,15 +270,17 @@
function mwLoadPlayer( callback ){
// The jsPlayerRequest includes both javascript and style sheets for
the embedPlayer
- var jsPlayerRequest = [
- 'mw.EmbedPlayer',
- 'mw.style.EmbedPlayer',
+ var jsPlayerRequest = [
'$j.ui',
'$j.widget',
'$j.ui.mouse',
+
+ '$j.cookie',
+ 'mw.EmbedPlayer',
+ 'mw.style.EmbedPlayer',
+
'mw.PlayerControlBuilder',
- '$j.fn.hoverIntent',
- '$j.cookie',
+ '$j.fn.hoverIntent',
'JSON',
'$j.ui.slider',
@@ -291,8 +295,11 @@
'mw.style.TimedText',
// mwSwarmTransport module
- 'mw.SwarmTransport'
+ 'mw.SwarmTransport',
+ // Sequencer remote:
+ 'mw.MediaWikiRemoteSequencer',
+ 'mw.style.SequencerRemote'
];
// Quick sniff use java if IE and native if firefox
// ( other browsers will run detect and get on-demand )
@@ -579,6 +586,8 @@
rurl += ',' + cName;
}
}
+ // force add our updated version of $j.cookie
+ rurl +=',$j.cookie';
// Add the remaining arguments
rurl += '&' + mwGetReqArgs();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
