| Index: branches/js2-work/phase3/js/mwEmbed/tests/media/sequence_transition_smil.xml |
| — | — | @@ -23,7 +23,14 @@ |
| 24 | 24 | </head> |
| 25 | 25 | <body> |
| 26 | 26 | <seq> |
| | 27 | + <ref type="text/html" dur="8" uri="Template:My_Video_Intro_Text"><![CDATA[ |
| | 28 | +<h3> <span class="mw-headline" id="cat">cat</span></h3> |
| | 29 | +<div class="thumb tright"><div class="thumbinner" style="width:102px;"><img src="http://upload.wikimedia.org/wikipedia/commons/thumb/d/dc/Nos_kota.jpg/120px-Nos_kota.jpg"></div></div> |
| | 30 | +<div style="color:gray"> MY Date: 21 January, 2010 00:45</div> |
| 27 | 31 | |
| | 32 | +]]><param name="videoTitle">cat</param><param name="MyDate">{{CURRENTDAY}} {{CURRENTMONTHNAME}}, {{CURRENTYEAR}} {{CURRENTTIME}}</param></ref> |
| | 33 | + |
| | 34 | + |
| 28 | 35 | <video src="http://upload.wikimedia.org/wikipedia/commons/d/d3/Okapia_johnstoni5.ogg" |
| 29 | 36 | region="video_region" |
| 30 | 37 | transIn="fromGreen" |
| — | — | @@ -42,7 +49,14 @@ |
| 43 | 50 | durationHint="70" |
| 44 | 51 | type="video/ogg" |
| 45 | 52 | poster="http://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/B-36_bomber.ogg/mid-B-36_bomber.ogg.jpg" |
| | 53 | + /> |
| | 54 | + |
| | 55 | + <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/b/b6/USS_Bunker_Hill_hit_by_two_Kamikazes.jpg/400px-USS_Bunker_Hill_hit_by_two_Kamikazes.jpg" |
| | 56 | + region="video_region" |
| | 57 | + dur="5s" |
| | 58 | + type="image/jpeg" |
| 46 | 59 | /> |
| | 60 | + |
| 47 | 61 | </seq> |
| 48 | 62 | |
| 49 | 63 | </body> |
| Index: branches/js2-work/phase3/js/mwEmbed/tests/Player_Themable.html |
| — | — | @@ -3,14 +3,15 @@ |
| 4 | 4 | <html> |
| 5 | 5 | <head> |
| 6 | 6 | <title>Sample Themed Player</title> |
| 7 | | - <!-- Pre-loading demo ( stuff ) likely needed for video display |
| 8 | | - <script type="text/javascript" src="../jsScriptLoader.php?urid=1.1a&class=window.jQuery,mwEmbed,$j.ui,mw.EmbedPlayer,nativeEmbed,kplayerEmbed,javaEmbed,vlcEmbed,ctrlBuilder,mvpcfConfig,kskinConfig,$j.fn.menu,$j.cookie,$j.ui.slider,mw.TimedText"></script> |
| | 7 | + <!-- Pre-loading demo ( stuff ) likely needed for video display --> |
| | 8 | + <script type="text/javascript" src="../jsScriptLoader.php?urid=1.1d&class=window.jQuery,mwEmbed,$j.ui,mw.EmbedPlayer,nativeEmbed,kplayerEmbed,javaEmbed,vlcEmbed,ctrlBuilder,mvpcfConfig,kskinConfig,$j.fn.menu,$j.cookie,$j.ui.slider,mw.TimedText"></script> |
| 9 | 9 | <link rel="stylesheet" href="../skins/styles.css" type="text/css" media="screen" /> |
| 10 | 10 | <link rel="stylesheet" href="../skins/mvpcf/playerSkin.css" type="text/css" media="screen" /> |
| 11 | | - <link rel="stylesheet" href="../skins/kskin/playerSkin.css" type="text/css" media="screen" /> |
| | 11 | + <link rel="stylesheet" href="../skins/kskin/playerSkin.css" type="text/css" media="screen" /> |
| | 12 | + |
| | 13 | + <!-- |
| | 14 | + <script type="text/javascript" src="../mwEmbed.js?debug=true"></script> |
| 12 | 15 | --> |
| 13 | | - |
| 14 | | - <script type="text/javascript" src="../mwEmbed.js?debug=true"></script> |
| 15 | 16 | |
| 16 | 17 | </head> |
| 17 | 18 | <script type="text/javascript"> |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/mw.EmbedPlayer.js |
| — | — | @@ -1473,8 +1473,8 @@ |
| 1474 | 1474 | if ( this.instanceOf ) { |
| 1475 | 1475 | eval( 'var tmpObj = ' + this.instanceOf ); |
| 1476 | 1476 | for ( var i in tmpObj ) { // for in loop oky for object |
| 1477 | | - if ( this['parent_' + i] ) { |
| 1478 | | - this[i] = this['parent_' + i]; |
| | 1477 | + if ( this[ 'parent_' + i ] ) { |
| | 1478 | + this[i] = this[ 'parent_' + i]; |
| 1479 | 1479 | } else { |
| 1480 | 1480 | this[i] = null; |
| 1481 | 1481 | } |
| — | — | @@ -1491,7 +1491,7 @@ |
| 1492 | 1492 | eval( ' var playerInterface =' + _this.selected_player.library + 'Embed;' ); |
| 1493 | 1493 | |
| 1494 | 1494 | for ( var method in playerInterface ) { |
| 1495 | | - if ( _this[method] ){ |
| | 1495 | + if ( _this[method] && !_this['parent_' + method] ){ |
| 1496 | 1496 | _this['parent_' + method] = _this[method]; |
| 1497 | 1497 | } |
| 1498 | 1498 | _this[ method ] = playerInterface[method]; |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/htmlEmbed.js |
| — | — | @@ -41,7 +41,8 @@ |
| 42 | 42 | /** |
| 43 | 43 | * Play function starts the v |
| 44 | 44 | */ |
| 45 | | - play:function() { |
| | 45 | + play: function() { |
| | 46 | + mw.log(" parent: " + this.parent_play); |
| 46 | 47 | // call the parent |
| 47 | 48 | this.parent_play(); |
| 48 | 49 | |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/nativeEmbed.js |
| — | — | @@ -62,7 +62,8 @@ |
| 63 | 63 | 'id="' + this.pid + '" ' + |
| 64 | 64 | 'style="width:' + this.width + 'px;height:' + this.height + 'px;" ' + |
| 65 | 65 | 'width="' + this.width + '" height="' + this.height + '" ' + |
| 66 | | - 'src="' + this.getSrc() + '" ' + |
| | 66 | + 'autobuffer="true" ' + |
| | 67 | + 'src="' + this.getSrc() + '" >' + |
| 67 | 68 | '</video>'; |
| 68 | 69 | return eb; |
| 69 | 70 | }, |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/Sequencer/mw.PlayList.js |
| — | — | @@ -196,7 +196,9 @@ |
| 197 | 197 | // import methods from the plObj to this |
| 198 | 198 | for ( var method in plObj ) { |
| 199 | 199 | // js parent preservation for local overwritten methods |
| 200 | | - if ( this[method] )this['parent_' + method] = this[method]; |
| | 200 | + if ( this[method] && !this[ 'parent_' + method ] ){ |
| | 201 | + this[ 'parent_' + method ] = this[ method ]; |
| | 202 | + } |
| 201 | 203 | this[method] = plObj[method]; |
| 202 | 204 | } |
| 203 | 205 | |
| — | — | @@ -748,7 +750,7 @@ |
| 749 | 751 | var _this = this; |
| 750 | 752 | mw.log( 'pl play' ); |
| 751 | 753 | // hide the playlist play button: |
| 752 | | - this.$interface.find('.play-btn-large' ).hide(); |
| | 754 | + this.$interface.find( '.play-btn-large' ).hide(); |
| 753 | 755 | |
| 754 | 756 | // un-pause if paused: |
| 755 | 757 | if ( this.paused ) |
| — | — | @@ -1846,7 +1848,7 @@ |
| 1847 | 1849 | mvTransLib.doUpdate( this, percentage ); |
| 1848 | 1850 | |
| 1849 | 1851 | if ( percentage >= 1 ) { |
| 1850 | | - mw.log( "transition done update with percentage " + percentage ); |
| | 1852 | + //mw.log( "transition done update with percentage " + percentage ); |
| 1851 | 1853 | this.animation_state = 2; |
| 1852 | 1854 | mvTransLib.doCloseTransition( this ) |
| 1853 | 1855 | return true; |