http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73763
Revision: 73763
Author: dale
Date: 2010-09-25 23:51:15 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
fixed $rootLayout not defined error
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.EmbedPlayerSmil.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.Smil.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
branches/MwEmbedStandAlone/modules/SwarmTransport/loader.js
branches/MwEmbedStandAlone/modules/SwarmTransport/mw.SwarmTransport.js
branches/MwEmbedStandAlone/remotes/mediaWiki.js
Added Paths:
-----------
branches/MwEmbedStandAlone/modules/SwarmTransport/mw.EmbedPlayerSwamVlc.js
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
2010-09-25 22:54:14 UTC (rev 73762)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
2010-09-25 23:51:15 UTC (rev 73763)
@@ -120,7 +120,7 @@
// Cache the pre / post bits
callback( _this.serverSmilXml );
- })
+ });
},
wrapSequencerWikiText : function( xmlString ){
var _this = this;
@@ -205,7 +205,7 @@
mw.log("SequenceServer::Save: " + saveSummary );
this.getSaveToken( function( token ){
if( !token ){
- callback( false, 'could not get edit
token')
+ callback( false, 'could not get edit
token');
return ;
}
var request = {
@@ -218,7 +218,7 @@
mw.getJSON( _this.getApiUrl(), request,
function( data ) {
if( data.edit && data.edit.result ==
'Success' ) {
// Update the latest local
variables
- _this.saveSummary = saveSummary
+ _this.saveSummary = saveSummary;
_this.sequenceSaved = true;
_this.serverSmilXml =
sequenceXML;
callback( true );
@@ -226,8 +226,8 @@
// xxx Should have more error
handling ( conflict version save etc )
callback( false, 'failed to
save to server');
}
- })
- })
+ });
+ });
},
/**
@@ -299,9 +299,9 @@
var pageText = '';
// Check if we should use commons asset
description template:
if( mw.parseUri( _this.getApiUrl() ).host ==
'commons.wikimedia.org' ){
- pageText =
_this.getCommonsDescriptionText()
+ pageText =
_this.getCommonsDescriptionText();
} else {
- pageText =
_this.getBaseFileDescription()
+ pageText =
_this.getBaseFileDescription();
}
var request = {
'action': 'edit',
@@ -318,7 +318,7 @@
callback( false );
}
});
- })
+ });
},
getBaseFileDescription: function(){
@@ -351,12 +351,12 @@
return '0' + num;
}
return num;
- }
+ };
var dt = new Date();
descText+='|Date=' + dt.getFullYear() + '-' +
pad2(dt.getMonth()+1) + '-' +
pad2(dt.getDate()) + "\n" +
- "|Author=Last edit by [[User:" +
_this.getUserName() + "]]\n" +
+ "|Author=Published by [[User:" +
_this.getUserName() + "]]\n" +
"For full editor list see history page of [[" +
_this.getTitleKey() + "]] \n" +
"|Permission={{Cc-by-sa-3.0}} and
{{GFDL|migration=redundant}}" + "\n" +
"}}";
@@ -418,7 +418,7 @@
'filename':
_this.getVideoFileName(),
'comment': 'Published [[' +
_this.getTitleKey() + ']] : ' + saveSummary,
'ignorewarnings' : true
- }
+ };
// Return the apiUrl and request
callback( _this.getApiUrl(), request );
});
Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.EmbedPlayerSmil.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SmilPlayer/mw.EmbedPlayerSmil.js
2010-09-25 22:54:14 UTC (rev 73762)
+++ branches/MwEmbedStandAlone/modules/SmilPlayer/mw.EmbedPlayerSmil.js
2010-09-25 23:51:15 UTC (rev 73763)
@@ -311,7 +311,7 @@
callback( _this.smil );
});
} else {
- callback( _this.smil );
+ callback( this.smil );
}
},
Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.Smil.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SmilPlayer/mw.Smil.js 2010-09-25
22:54:14 UTC (rev 73762)
+++ branches/MwEmbedStandAlone/modules/SmilPlayer/mw.Smil.js 2010-09-25
23:51:15 UTC (rev 73763)
@@ -158,9 +158,9 @@
/**
* Render a specific time
*/
- renderTime : function(time, callback) {
+ renderTime : function(time, callback) {
// Setup the layout if not already setup:
-
this.getLayout().setupLayout(this.embedPlayer.getRenderTarget());
+ this.getLayout().setupLayout(
this.embedPlayer.getRenderTarget() );
// Update the render target with bodyElements for the requested
time
this.getBody().renderTime( time );
Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
2010-09-25 22:54:14 UTC (rev 73762)
+++ branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
2010-09-25 23:51:15 UTC (rev 73763)
@@ -236,8 +236,10 @@
transformMediaForTime: function( smilElement, animateTime, callback ){
// Get the video element
var assetId = this.smil.getSmilElementPlayerID( smilElement );
- var vid = $j ( '#' + assetId ).get( 0 );
- mw.log( "SmilAnimate::transformMediaForTime:" + assetId + "
ct:" +vid.currentTime + ' should be: ' + mediaSeekTime );
+ var media = $j ( '#' + assetId ).get( 0 );
+ if( !media ){
+ mw.log("Error: transformMediaForTime could not find
media asest: " +assetId );
+ }
var mediaSeekTime = animateTime;
Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
2010-09-25 22:54:14 UTC (rev 73762)
+++ branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilLayout.js
2010-09-25 23:51:15 UTC (rev 73763)
@@ -41,10 +41,11 @@
/**
* Setup the layout if not already setup
*/
- setupLayout: function( $renderTarget ){
+ setupLayout: function( $renderTarget ){
if( ! $renderTarget.find( '.smilRootLayout').length ) {
$renderTarget.append( this.getRootLayout() );
}
+ this.$rootLayout =$renderTarget.find( '.smilRootLayout');
},
getTargetAspectRatio:function(){
@@ -56,8 +57,8 @@
*/
getRootLayout: function(){
var _this = this;
- mw.log( "SmilLayout::getRootLayout:" );
- if( !this.$rootLayout ){
+ mw.log( "SmilLayout::getRootLayout:" );
+ if( !this.$rootLayout ) {
// Setup target Size:
this.targetWidth = this.smil.embedPlayer.getWidth();
this.targetHeight = this.smil.embedPlayer.getHeight();
@@ -336,14 +337,13 @@
/**
* Hide a smilElement in the layout
*/
- hideElement: function( smilElement ){
- if( this.$rootLayout ){
- // Check that the element is already in the dom
- var $targetElement = this.$rootLayout.find( '#' +
this.smil.getSmilElementPlayerID( smilElement ) );
- if( $targetElement.length ){
- // Issue a quick hide request
- $targetElement.hide();
- }
+ hideElement: function( smilElement ){
+ mw.log(" hide: " + this.smil.getSmilElementPlayerID(
smilElement ));
+ // Check that the element is already in the dom
+ var $targetElement = this.$rootLayout.find( '#' +
this.smil.getSmilElementPlayerID( smilElement ) );
+ if( $targetElement.length ){
+ // Issue a quick hide request
+ $targetElement.hide();
}
},
Modified: branches/MwEmbedStandAlone/modules/SwarmTransport/loader.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SwarmTransport/loader.js 2010-09-25
22:54:14 UTC (rev 73762)
+++ branches/MwEmbedStandAlone/modules/SwarmTransport/loader.js 2010-09-25
23:51:15 UTC (rev 73763)
@@ -8,12 +8,14 @@
( function( mw ) {
mw.addResourcePaths( {
- "mw.SwarmTransport" : "mw.SwarmTransport.js"
+ "mw.SwarmTransport" : "mw.SwarmTransport.js",
+ "mw.EmbedPlayerSwamVlc" : "mw.EmbedPlayerSwamVlc.js"
});
mw.setDefaultConfig({
/**
- * If SwarmTransport should be enabled by default as video
transport mechanism
+ * If SwarmTransport should be enabled as video transport
mechanism
+ * Enabling SwarmTransport loads mw.SwarmTransport, vlc and
swarmvlc embed if in IE.
*/
'SwarmTransport.Enable': false,
@@ -34,6 +36,13 @@
if( mw.getConfig( 'SwarmTransport.Enable' ) ) {
if( $j.inArray( 'mw.SwarmTransport', classRequest ) ==
-1 ) {
classRequest.push( [ 'mw.SwarmTransport' ]);
+ // if IE / ActiveX
+ // Look for swarm player:
+ if( mw.EmbedTypes.testActiveX(
'P2PNext.SwarmPlayer' ) ){
+ // Add vlc and swarmVlc to request
+ classRequest.push( 'mw.EmbedPlayerVlc'
);
+ classRequest.push(
'mw.EmbedPlayerSwarmVlc' );
+ }
}
}
});
Added:
branches/MwEmbedStandAlone/modules/SwarmTransport/mw.EmbedPlayerSwamVlc.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SwarmTransport/mw.EmbedPlayerSwamVlc.js
(rev 0)
+++ branches/MwEmbedStandAlone/modules/SwarmTransport/mw.EmbedPlayerSwamVlc.js
2010-09-25 23:51:15 UTC (rev 73763)
@@ -0,0 +1,37 @@
+/*
+* Swarm VLC embed
+* inherits EmbedPlayerVlc
+*/
+mw.EmbedPlayerSwarmVlc = {
+
+ //Instance Name:
+ instanceOf : 'SwarmVlc',
+
+ doEmbedHTML: function() {
+ var _this = this;
+ var oggHttpSource = this.mediaElement.getSources( 'video/ogg'
)[0];
+ $j( this ).html(
+ '<object
classid="clsid:98FF91C0-A3B8-11DF-8555-0002A5D5C51B" ' +
+ 'id="' + this.pid + '" events="True" height="'
+ this.getHeight() + '" width="' + this.getWidth() + '"' +
+ '>' +
+ '<param name="ShowDisplay" value="True"
/>' +
+ '<param name="AutoLoop" value="False"
/>' +
+ '<param name="AutoPlay" value="True"
/>' +
+ '<param name="Volume" value="'+
this.volume * 100 + '" />' +
+ '<param name="Src" value="' +
this.getSrc() +'" />' +
+ '<param name="AltSrc" value="' +
mw.absoluteUrl( oggHttpSource.getSrc() ) + '" />' +
+ '</object>'
+ );
+ setTimeout( function() {
+ _this.monitor();
+ }, 100 );
+ }
+};
+// Inherit the vlc object
+if( typeof mw.EmbedPlayerVlc == 'undefined' ){
+ mw.log("Error:: EmbedPLayerVlc not defefined ");
+} else {
+ for(var i in mw.EmbedPlayerVlc.prototype ){
+ mw.EmbedPlayerSwarmVlc
+ };
+}
Modified: branches/MwEmbedStandAlone/modules/SwarmTransport/mw.SwarmTransport.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SwarmTransport/mw.SwarmTransport.js
2010-09-25 22:54:14 UTC (rev 73762)
+++ branches/MwEmbedStandAlone/modules/SwarmTransport/mw.SwarmTransport.js
2010-09-25 23:51:15 UTC (rev 73763)
@@ -19,7 +19,7 @@
// Setup the "embedCode" binding to swap in an updated
url
$j( embedPlayer ).bind( 'checkPlayerSourcesEvent',
function( event, callback ) {
// Confirm SwarmTransport add-on is available (
defines swarmTransport var )
- if( _this.getPluginLibrary() ){
+ if( _this.getPluginLibrary() ){
// Add the swarm source
mw.log(" SwarmTransport ::
checkPlayerSourcesEvent " + swapedPlayerId);
_this.addSwarmSource( embedPlayer,
function(){
@@ -69,7 +69,7 @@
}
// Look for swarm player:
if( mw.EmbedTypes.testActiveX( 'P2PNext.SwarmPlayer' ) ){
- return 'Vlc';
+ return 'SwarmVlc';
}
return false;
},
Modified: branches/MwEmbedStandAlone/remotes/mediaWiki.js
===================================================================
--- branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-25 22:54:14 UTC
(rev 73762)
+++ branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-25 23:51:15 UTC
(rev 73763)
@@ -36,7 +36,7 @@
}
//mwReqParam['debug'] = false;
-//mwUseScriptLoader = true;
+mwUseScriptLoader = true;
//mwRemoteVersion = Math.random();
// Setup up some globals to wrap mwEmbed mw.ready and mw.setConfig functions
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
