http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73799
Revision: 73799
Author: dale
Date: 2010-09-27 07:13:23 +0000 (Mon, 27 Sep 2010)
Log Message:
-----------
* some ie fixes
* removed vlc debug lines
* removed non-used object height width
* bumped revision number for release
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerVlc.js
branches/MwEmbedStandAlone/modules/SwarmTransport/mw.EmbedPlayerSwarmVlc.js
branches/MwEmbedStandAlone/remotes/mediaWiki.js
Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerVlc.js
===================================================================
--- branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerVlc.js
2010-09-27 01:02:29 UTC (rev 73798)
+++ branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerVlc.js
2010-09-27 07:13:23 UTC (rev 73799)
@@ -174,9 +174,9 @@
if ( !this.playerElement )
return ;
try{
- mw.log( 'state:' + this.playerElement.input.state);
- mw.log('time: ' + this.playerElement.input.time);
- mw.log('pos: ' + this.playerElement.input.position);
+ //mw.log( 'state:' + this.playerElement.input.state);
+ //mw.log('time: ' + this.playerElement.input.time);
+ //mw.log('pos: ' + this.playerElement.input.position);
if ( this.playerElement.log.messages.count > 0 ) {
// there is one or more messages in the log
var iter =
this.playerElement.log.messages.iterator();
@@ -302,9 +302,12 @@
*/
pause : function() {
this.parent_pause(); // update the interface if paused via
native control
- if ( this.getPlayerElement() ) {
- alter('togglePause:' +
document[this.pid].playlist.togglePause );
- document[this.pid].playlist.togglePause();
+ if ( this.getPlayerElement() ) {
+ try{
+ this.playerElement.playlist.togglePause();
+ } catch( e ){
+ mw.log("EmbedPlayerVlc could not pause video "
+ e);
+ }
}
},
@@ -355,12 +358,8 @@
/**
* Get the embed vlc object
*/
- getPlayerElement : function() {
- if( $j.browser.msie ){
- this.playerElement = document[this.pid];
- }else{
- this.playerElement = $j( '#' + this.pid ).get(0);
- }
+ getPlayerElement : function() {
+ this.playerElement = $j( '#' + this.pid ).get(0);
return this.playerElement;
}
};
Modified:
branches/MwEmbedStandAlone/modules/SwarmTransport/mw.EmbedPlayerSwarmVlc.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SwarmTransport/mw.EmbedPlayerSwarmVlc.js
2010-09-27 01:02:29 UTC (rev 73798)
+++ branches/MwEmbedStandAlone/modules/SwarmTransport/mw.EmbedPlayerSwarmVlc.js
2010-09-27 07:13:23 UTC (rev 73799)
@@ -13,7 +13,7 @@
$j( this ).html(
'<object
classid="clsid:98FF91C0-A3B8-11DF-8555-0002A5D5C51B" ' +
'name="' + this.pid + '" ' +
- 'id="' + this.pid + '" events="True" height="'
+ this.getPlayerHeight() + '" width="' + this.getPlayerWidth() + '"' +
+ 'id="' + this.pid + '" events="True" target=""
' +
'>' +
'<param name="ShowDisplay" value="True"
/>' +
'<param name="AutoLoop" value="False"
/>' +
Modified: branches/MwEmbedStandAlone/remotes/mediaWiki.js
===================================================================
--- branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-27 01:02:29 UTC
(rev 73798)
+++ branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-27 07:13:23 UTC
(rev 73799)
@@ -4,7 +4,7 @@
*/
var urlparts = getRemoteEmbedPath();
var mwEmbedHostPath = urlparts[0];
-var mwRemoteVersion = 'r154';
+var mwRemoteVersion = 'r155';
var mwUseScriptLoader = true;
// Log the mwRemote version makes it easy to debug cache issues
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
