| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/mv_nativeEmbed.js |
| — | — | @@ -1,26 +1,17 @@ |
| 2 | 2 | |
| 3 | 3 | var nativeEmbed = { |
| 4 | 4 | instanceOf:'nativeEmbed', |
| 5 | | - getEmbedHTML : function (){ |
| 6 | | - var controls_html =''; |
| 7 | | - js_log('embedObj control is: '+this.controls); |
| 8 | | - if(this.controls){ |
| 9 | | - controls_html+= this.getControlsHtml('play_or_pause'); |
| 10 | | - controls_html+= this.getControlsHtml('stop'); |
| 11 | | - //if in playlist mode get prev/next and run postEmbedJS(): |
| 12 | | - if(this.pc){ |
| 13 | | - controls_html+= this.pc.pp.getPLControls(); |
| 14 | | - } |
| 15 | | - } |
| | 5 | + supports: {'play_head':true, 'play_or_pause':true, 'stop':true, 'fullscreen':true, 'time_display':true, 'volume_control':true}, |
| | 6 | + getEmbedHTML : function (){ |
| 16 | 7 | setTimeout('document.getElementById(\''+this.id+'\').postEmbedJS()', 150); |
| 17 | 8 | //set a default duration of 30 seconds: cortao should detect duration. |
| 18 | | - return this.wrapEmebedContainer( this.getEmbedObj() )+ controls_html; |
| | 9 | + return this.wrapEmebedContainer( this.getEmbedObj() ); |
| 19 | 10 | }, |
| 20 | 11 | getEmbedObj:function(){ |
| 21 | 12 | return '<video " ' + |
| 22 | 13 | 'id="'+this.pid + '" ' + |
| 23 | 14 | 'style="width:'+this.width+';height:'+this.height+';" ' + |
| 24 | | - 'src="'+this.src+'" >' + |
| | 15 | + 'src="'+this.media_element.selected_source.uri+'" >' + |
| 25 | 16 | '</video>'; |
| 26 | 17 | }, |
| 27 | 18 | postEmbedJS:function(){ |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/sample_page.php |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | //$sample_embed[1]['tag'] = '<video roe="http://192.168.0.104/mvWiki/index.php?title=Special:MvExportStream&feed_format=roe&stream_name=Senate_proceeding_08-01-07&t=0:00:00/0:05:00">'; |
| 58 | 58 | //$sample_embed[1]['desc'] = 'Demo of json ROE attribute'; |
| 59 | 59 | |
| 60 | | -$sample_embed[3]['tag'] = '<video roe="http://metavid.ucsc.edu/wiki/index.php?title=Special:MvExportStream&feed_format=roe&stream_name=Senate_proceeding_08-01-07&t=0:06:00/0:07:00"></video>'; |
| | 60 | +$sample_embed[3]['tag'] = '<video style="width:100%; height:100%" roe="http://metavid.ucsc.edu/wiki/index.php?title=Special:MvExportStream&feed_format=roe&stream_name=Senate_proceeding_08-01-07&t=0:06:00/0:07:00"></video>'; |
| 61 | 61 | $sample_embed[3]['desc'] = 'Demo2 of json ROE attribute'; |
| 62 | 62 | |
| 63 | 63 | |
| Index: branches/MetavidWiki-exp/MetavidWiki/skins/mv_embed/skin/styles.css |
| — | — | @@ -258,7 +258,7 @@ |
| 259 | 259 | |
| 260 | 260 | .videoOptionsBox div.block p.normal_match a { |
| 261 | 261 | padding: 0; |
| 262 | | - margin; 0; |
| | 262 | + margin: 0; |
| 263 | 263 | display: block; |
| 264 | 264 | width: 100%; |
| 265 | 265 | border: 0; |