http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96156
Revision: 96156
Author: dale
Date: 2011-09-02 22:20:29 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
fixed relative url usage of mw.Uri
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.MediaSource.js
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
2011-09-02 22:10:29 UTC (rev 96155)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
2011-09-02 22:20:29 UTC (rev 96156)
@@ -102,7 +102,7 @@
mediaWiki.loader.using( dependencySet, function(){
mw.processEmbedPlayers( playerSelect, readyCallback );
}, function( e ){
- throw new Error( 'Error loading EmbedPlayer dependency
set' );
+ throw new Error( 'Error loading EmbedPlayer dependency
set: ' + e.message );
});
};
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.MediaSource.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.MediaSource.js
2011-09-02 22:10:29 UTC (rev 96155)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.MediaSource.js
2011-09-02 22:20:29 UTC (rev 96156)
@@ -106,7 +106,8 @@
// Set default URLTimeEncoding if we have a time url:
// not ideal way to discover if content is on an oggz_chop
server.
// should check some other way.
- var pUrl = new mw.Uri ( this.src );
+ var pUrl = new mw.Uri ( mw.absoluteUrl( this.src) ); //
mw.Uri only handles full urls
+
if ( typeof pUrl.query[ 't' ] != 'undefined' ) {
this.URLTimeEncoding = true;
}
@@ -308,7 +309,7 @@
// Return title based on file name:
try{
- var fileName = new mw.Uri( this.getSrc()
).path.split('/').pop();
+ var fileName = new mw.Uri( mw.absoluteUrl(
this.getSrc() ) ).path.split('/').pop();
if( fileName ){
return fileName;
}
@@ -327,7 +328,7 @@
getURLDuration : function() {
// check if we have a URLTimeEncoding:
if ( this.URLTimeEncoding ) {
- var annoURL = new mw.Uri( this.src );
+ var annoURL = new mw.Uri( mw.absoluteUrl( this.getSrc()
) );
if ( annoURL.query.t ) {
var times = annoURL.query.t.split( '/' );
this.start_npt = times[0];
@@ -350,7 +351,7 @@
* @param String uri
*/
getExt : function( uri ){
- var urlParts = new mw.Uri( uri );
+ var urlParts = new mw.Uri( mw.absoluteUrl( uri ) );
// Get the extension from the url or from the relative name:
var ext = ( urlParts.file )? /[^.]+$/.exec( urlParts.file ) :
/[^.]+$/.exec( uri );
return ext.toString().toLowerCase()
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
