Index: trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js |
— | — | @@ -99,6 +99,13 @@ |
100 | 100 | "roe":null, |
101 | 101 | //if roe includes metadata tracks we can expose a link to metadata |
102 | 102 | "show_meta_link":true, |
| 103 | + |
| 104 | + //default state attributes per html5 spec: |
| 105 | + //http://www.whatwg.org/specs/web-apps/current-work/#video) |
| 106 | + "paused":true, |
| 107 | + "readyState":0, //http://www.whatwg.org/specs/web-apps/current-work/#readystate |
| 108 | + "currentTime":0, //current playback position (should be updated by plugin) |
| 109 | + "duration":NaN, //media duration (read from file or anx temporal url) |
103 | 110 | |
104 | 111 | //custom attributes for mv_embed: |
105 | 112 | "play_button":true, |
— | — | @@ -673,22 +680,26 @@ |
674 | 681 | } |
675 | 682 | } |
676 | 683 | ///js_log('did vI style'); |
677 | | - //now swap out the video element for the embed_video obj: |
678 | | - var parent_elm = video_element.parentNode; |
| 684 | + //now swap out the video element for the embed_video obj: |
| 685 | + $j(video_element).after(embed_video).remove(); |
| 686 | + //update HTML |
| 687 | + $j('#'+embed_video.id).get(0).getHTML(); |
| 688 | + |
| 689 | + /*var parent_elm = video_element.parentNode; |
679 | 690 | parent_elm.removeChild(video_element); |
680 | 691 | |
681 | 692 | //append the object into the dom: |
682 | 693 | parent_elm.appendChild(embed_video); |
683 | 694 | |
684 | 695 | //now run the getHTML on the new embedVideo Obj: |
685 | | - embed_video.getHTML(); |
686 | | - //js_log('html set:' + document.getElementById(embed_video.id).innerHTML); |
687 | | - |
| 696 | + embed_video.getHTML(); |
| 697 | + */ |
| 698 | + js_log('html set:' + document.getElementById(embed_video.id).innerHTML); |
688 | 699 | //store a reference to the id |
689 | 700 | //(for single instance plugins that need to keep track of other instances on the page) |
690 | 701 | global_ogg_list.push(embed_video.id); |
691 | 702 | |
692 | | - js_log('append child: ' + embed_video.id + ' len:'+global_ogg_list.length); |
| 703 | + js_log('done with child: ' + embed_video.id + ' len:'+global_ogg_list.length); |
693 | 704 | return true; |
694 | 705 | } |
695 | 706 | /* |
— | — | @@ -723,7 +734,7 @@ |
724 | 735 | //parse roe if not already done: |
725 | 736 | |
726 | 737 | //if not "live" or under 5 min load all transcript in one request |
727 | | - if(!this.pe.roe_data){ |
| 738 | + if(!this.pe.roe_xml){ |
728 | 739 | js_log("MISSING ROE DATA for text interface"); |
729 | 740 | var _this = this; |
730 | 741 | this.pe.getParseROE( function(){ |
— | — | @@ -744,7 +755,7 @@ |
745 | 756 | |
746 | 757 | //@@todo use user-language as key to select transcript layer. |
747 | 758 | _this = this; |
748 | | - $j.each(this.pe.roe_data.getElementsByTagName('mediaSource'), function(inx, n){ |
| 759 | + $j.each(this.pe.roe_xml.getElementsByTagName('mediaSource'), function(inx, n){ |
749 | 760 | if(n.getAttribute('content-type')=='text/cmml'){ |
750 | 761 | _this.availableTracks[n.getAttribute('id')] = { |
751 | 762 | src:n.getAttribute('src'), |
— | — | @@ -842,14 +853,15 @@ |
843 | 854 | }, |
844 | 855 | show:function(){ |
845 | 856 | //js_log("show text interface"); |
846 | | - /*fade out cc*/ |
847 | | - $j('#metaText_'+this.pe.id).fadeOut('fast'); |
| 857 | + /*fade out cc button*/ |
| 858 | + $j('#metaButton_'+this.pe.id).fadeOut('fast'); |
848 | 859 | /*slide in intefrace container*/ |
849 | 860 | if($j('#metaBox_'+this.pe.id).length==0){ |
| 861 | + |
850 | 862 | //append it to body relative to offset of this.pe |
851 | 863 | var loc = $j(this.pe).position(); |
852 | 864 | js_log('top ' +loc.top + ' left:'+loc.left ); |
853 | | - var mvboxHTML ='<div style="position:absolute;z-index: 5001;' + |
| 865 | + var mvboxHTML ='<div style="position:absolute;z-index: '+ getNextHighestZindex() +';'+ |
854 | 866 | 'top:'+(loc.top)+'px;' + |
855 | 867 | 'left:'+(parseInt(loc.left)+parseInt(this.pe.width)+10)+'px;' + |
856 | 868 | 'height:'+this.pe.height+'px;width:400px;' + |
— | — | @@ -870,7 +882,7 @@ |
871 | 883 | //the meta box: |
872 | 884 | $j('#metaBox_'+this.pe.id).fadeOut('fast'); |
873 | 885 | //the icon link: |
874 | | - $j('#metaText_'+this.pe.id).fadeIn('fast'); |
| 886 | + $j('#metaButton_'+this.pe.id).fadeIn('fast'); |
875 | 887 | }, |
876 | 888 | getBody:function(){ |
877 | 889 | return '<div id="mmbody_'+this.pe.id+'" style="position:absolute;top:20px;left:0px;right:0px;bottom:0px;height:'+(this.pe.height-20)+'px;overflow:auto;"/>'; |
— | — | @@ -918,7 +930,7 @@ |
919 | 931 | }, |
920 | 932 | monitor:function(){ |
921 | 933 | //grab the time from the video object |
922 | | - var cur_time = parseInt( this.pe.currentTime() ); |
| 934 | + var cur_time = parseInt( this.pe.currentTime ); |
923 | 935 | if(cur_time!=0 && this.prevTimeScroll!=cur_time){ |
924 | 936 | //search for current time: flash red border trascript |
925 | 937 | _this = this; |
— | — | @@ -938,7 +950,7 @@ |
939 | 951 | this.scrollTimerId = setInterval('document.getElementById(\''+this.pe.id+'\').textInterface.monitor()', 500); |
940 | 952 | } |
941 | 953 | //jump to the current position: |
942 | | - var cur_time = parseInt (this.pe.currentTime()); |
| 954 | + var cur_time = parseInt (this.pe.currentTime ); |
943 | 955 | js_log('cur time: '+ cur_time); |
944 | 956 | |
945 | 957 | _this = this; |
— | — | @@ -959,7 +971,7 @@ |
960 | 972 | //add in loading icon: |
961 | 973 | /* |
962 | 974 | out+= '<div class="mv_loading_icon" style="background:url(\''+mv_embed_path+'images/indicator.gif\');display:'; |
963 | | - out+= (this.roe_data)? 'none':'inline'; |
| 975 | + out+= (this.roe_xml)? 'none':'inline'; |
964 | 976 | out+='"/>'; |
965 | 977 | */ |
966 | 978 | var as_checked = (this.autoscroll)?'checked':''; |
— | — | @@ -986,15 +998,8 @@ |
987 | 999 | //base embedVideo object |
988 | 1000 | embedVideo.prototype = { |
989 | 1001 | slider:null, |
990 | | - roe_data:null, |
991 | | - load_external_data:false, |
992 | | - //state attributes (per html5 spec http://www.whatwg.org/specs/web-apps/current-work/#video) |
993 | | - video_states:{ |
994 | | - "paused":true, |
995 | | - "readyState":0, //http://www.whatwg.org/specs/web-apps/current-work/#readystate |
996 | | - "currentTime":0, //current playback position (should be overwritten by local functions) |
997 | | - "duration":NaN //media duration (read from file or anx temporal url) |
998 | | - }, |
| 1002 | + roe_xml:null, |
| 1003 | + load_external_data:false, |
999 | 1004 | //utility functions for property values: |
1000 | 1005 | hx : function ( s ) { |
1001 | 1006 | if ( typeof s != 'String' ) { |
— | — | @@ -1026,10 +1031,6 @@ |
1027 | 1032 | if(this.roe==null){ |
1028 | 1033 | this['show_meta_link']=false; |
1029 | 1034 | } |
1030 | | - //init the default states: |
1031 | | - for(var state in this.video_states){ |
1032 | | - this[state]=this.video_states[state]; |
1033 | | - } |
1034 | 1035 | js_log('continue_thumb:'+ this['thumbnail']); |
1035 | 1036 | js_log('continue_src:'+ this['src']); |
1036 | 1037 | //if the thumbnail is null replace with default thumb: |
— | — | @@ -1088,17 +1089,15 @@ |
1089 | 1090 | getParseROE: function(callback){ |
1090 | 1091 | var _this = this; |
1091 | 1092 | do_request(this.roe, function(data){ |
1092 | | - js_log('got DATA!!!!!!!'); |
1093 | | - //$j.each(data.getElementsByTagName('mediaSource'), function(inx, n){ |
| 1093 | + js_log('got DATA!!!!!!!' + typeof data); |
1094 | 1094 | // alert('found mediaSource'); |
1095 | 1095 | //}); |
1096 | | - elm = data.getElementById('html_linkback'); |
1097 | | - js_log("on: "+_this.id + " got data "+ data.length + ' test elm:' + elm.getAttribute('rel')); |
1098 | | - if(typeof data == 'object' ){ |
1099 | | - js_log('type of data is object, data:'+ data.toString()); |
1100 | | - _this.roe_data = data; |
| 1096 | + //elm = xml.getElementById('html_linkback'); |
| 1097 | + //js_log("on: "+_this.id + " got xml "+ xml.length + ' test elm:' + elm.getAttribute('rel')); |
| 1098 | + if(typeof data == 'object' ){ |
| 1099 | + _this.roe_xml = data; |
1101 | 1100 | var cmml_available=false; |
1102 | | - $j.each(_this.roe_data.getElementsByTagName('mediaSource'), function(inx, n){ |
| 1101 | + $j.each(_this.roe_xml.getElementsByTagName('mediaSource'), function(inx, n){ |
1103 | 1102 | js_log(' on element: ' + n.getAttribute('content-type')); |
1104 | 1103 | if(n.getAttribute('content-type')=='video/ogg' && n.getAttribute("default")=="true"){ |
1105 | 1104 | js_log('set src to '+n.getAttribute("src")); |
— | — | @@ -1115,9 +1114,9 @@ |
1116 | 1115 | } |
1117 | 1116 | /* |
1118 | 1117 | //set the src to video tag with "default" attribute: |
1119 | | - //var rVids = _this.roe_data.getElementsByTagName('video'); |
| 1118 | + //var rVids = _this.roe_xml.getElementsByTagName('video'); |
1120 | 1119 | js_log('found '+ rVids.length + ' video tags'); |
1121 | | - $j.each(_this.roe_data.getElementsByTagName('video'), function(inx,n){ |
| 1120 | + $j.each(_this.roe_xml.getElementsByTagName('video'), function(inx,n){ |
1122 | 1121 | if(n.getAttribute("default")=="true"){ |
1123 | 1122 | js_log('set src to '+n.getAttribute("src")); |
1124 | 1123 | _this['src'] = n.getAttribute("src"); |
— | — | @@ -1125,14 +1124,14 @@ |
1126 | 1125 | }); |
1127 | 1126 | */ |
1128 | 1127 | //set the thumbnail: |
1129 | | - $j.each(_this.roe_data.getElementsByTagName('img'), function(inx, n){ |
| 1128 | + $j.each(_this.roe_xml.getElementsByTagName('img'), function(inx, n){ |
1130 | 1129 | if(n.getAttribute("id")=="stream_thumb"){ |
1131 | 1130 | js_log('set thumb to '+n.getAttribute("src")); |
1132 | 1131 | _this['thumbnail'] = n.getAttribute("src"); |
1133 | 1132 | } |
1134 | 1133 | }); |
1135 | 1134 | //set the linkback: |
1136 | | - $j.each(_this.roe_data.getElementsByTagName('link'), function(inx, n){ |
| 1135 | + $j.each(_this.roe_xml.getElementsByTagName('link'), function(inx, n){ |
1137 | 1136 | if(n.getAttribute('id')=='html_linkback'){ |
1138 | 1137 | js_log('set linkback to '+n.getAttribute("href")); |
1139 | 1138 | _this['linkback'] = n.getAttribute('href'); |
— | — | @@ -1143,7 +1142,7 @@ |
1144 | 1143 | //could not find default video src for playback |
1145 | 1144 | $j(_this).html(getMsg('missing_video_stream')); |
1146 | 1145 | }else{ |
1147 | | - //js_log("do callback roe data:"+_this['roe_data']+' '+ _this['src'] +' '+ _this['thumbnail'] + 'cb: '+ callback); |
| 1146 | + //js_log("do callback roe data:"+_this['roe_xml']+' '+ _this['src'] +' '+ _this['thumbnail'] + 'cb: '+ callback); |
1148 | 1147 | callback(_this.id); |
1149 | 1148 | } |
1150 | 1149 | }); |
— | — | @@ -1316,7 +1315,7 @@ |
1317 | 1316 | if(this.show_meta_link){ |
1318 | 1317 | thumb_html+='<div style="border:none;position:absolute;top:2px;right:2px;z-index:1">'+ |
1319 | 1318 | '<a title="'+getMsg('select_transcript_set')+'" href="javascript:document.getElementById(\''+this.id+'\').showTextInterface();">'; |
1320 | | - thumb_html+=getTransparentPng({id:'metaText_'+this.id, width:"40", height:"27", border:"0", |
| 1319 | + thumb_html+=getTransparentPng({id:'metaButton_'+this.id, width:"40", height:"27", border:"0", |
1321 | 1320 | src:mv_embed_path + 'images/cc_meta_sm.png' }); |
1322 | 1321 | thumb_html+='</div>'; |
1323 | 1322 | } |
— | — | @@ -1361,11 +1360,13 @@ |
1362 | 1361 | 'src="'+mv_embed_path+'mv_embed.js"></script>' + |
1363 | 1362 | '<video '; |
1364 | 1363 | if(this.roe){ |
1365 | | - embed_code_html+='roe="'+this.roe+'" />'; |
| 1364 | + embed_code_html+='roe="'+this.roe+'" >'; |
1366 | 1365 | }else{ |
1367 | 1366 | embed_code_html+='src="'+this.src+'" ' + |
1368 | | - 'thumbnail="'+embed_thumb_html+'"/>'; |
| 1367 | + 'thumbnail="'+embed_thumb_html+'">'; |
1369 | 1368 | } |
| 1369 | + //close the video tag |
| 1370 | + embed_code_html+='</video>'; |
1370 | 1371 | //add the hidden embed code: |
1371 | 1372 | thumb_html+='<div id="embed_code_'+this.id+'" style="border:solid;border-color:black;overflow:hidden;display:none;position:absolute;bottom:2px;right:'+(right_offset+30)+'px;width:'+(this.width-100)+'px;z-index:1">'+ |
1372 | 1373 | '<input onClick="this.select();" type="text" size="40" length="1024" value="'+embed_code_html+'">' |
— | — | @@ -1445,7 +1446,7 @@ |
1446 | 1447 | '<span id="con_vl_'+this.id+'" style="position:absolute;top:20px;left:20px;color:white;">'; |
1447 | 1448 | var dl_list=''; |
1448 | 1449 | //set to loading if we don't have the roe data yet: |
1449 | | - if(!this.roe_data && this.roe){ |
| 1450 | + if(!this.roe_xml && this.roe){ |
1450 | 1451 | select_code+=getMsg('loading_txt'); |
1451 | 1452 | var _this = this; |
1452 | 1453 | this.getParseROE(function(){ |
— | — | @@ -1465,7 +1466,7 @@ |
1466 | 1467 | var out='<b style="color:white;">'+getMsg('download_from')+' '+parseUri(this.src).queryKey['t']+'</b><br>'; |
1467 | 1468 | out+='<span style="color:white"><blockquote>'; |
1468 | 1469 | var dl_list=dl_txt_list=''; |
1469 | | - $j.each(this.roe_data.getElementsByTagName('mediaSource'), function(inx,n){ |
| 1470 | + $j.each(this.roe_xml.getElementsByTagName('mediaSource'), function(inx,n){ |
1470 | 1471 | var dl_line = '<li><a style="color:white" href="' + n.getAttribute("src") +'"> '+ |
1471 | 1472 | n.getAttribute("title")+'</a></li>'+"\n"; |
1472 | 1473 | if(n.getAttribute("content-type")=="video/ogg"){ |
— | — | @@ -1812,21 +1813,22 @@ |
1813 | 1814 | }else{ |
1814 | 1815 | //check if MV_embed path matches document.URL then we can use the local proxy: |
1815 | 1816 | if(parseUri(document.URL).host == parseUri(mv_embed_path).host ){ |
1816 | | - js_log('use mv_embed_proxy : ' + parseUri(document.URL).host + ' != '+ parseUri(req_url).host); |
| 1817 | + js_log('use mv_embed_proxy : ' + parseUri(document.URL).host + ' == '+ parseUri(mv_embed_path).host); |
1817 | 1818 | //alert("do ajax req:" +req_url); |
1818 | 1819 | $j.ajax({ |
1819 | 1820 | type: "POST", |
1820 | | - url:mv_embed_path + 'mv_data_proxy.php', |
| 1821 | + url:mv_embed_path + 'mv_data_proxy.php', |
1821 | 1822 | data:{url:req_url}, |
1822 | | - success:function(data){ |
1823 | | - js_log("did ajax req:"+ typeof data); |
| 1823 | + success:function(data){ |
1824 | 1824 | callback(data); |
1825 | 1825 | } |
1826 | 1826 | }); |
1827 | 1827 | }else{ |
1828 | | - //need to get data via DOM proxy injection with callback |
| 1828 | + //get data via DOM injection of proxy request with callback |
1829 | 1829 | global_req_cb.push(callback); |
1830 | | - if(!mv_json_response){ |
| 1830 | + if(!mv_json_response){ |
| 1831 | + //@@todo should remove this functionality from mv_data_proxy |
| 1832 | + //and require sites serve up data as javascript with a callback |
1831 | 1833 | req_url =req_url.replace(/&/g,'__amp__'); |
1832 | 1834 | loadExternalJs(mv_embed_path+'mv_data_proxy.php?url='+req_url+ |
1833 | 1835 | '&cb=mv_jsdata_cb&cb_inx='+(global_req_cb.length-1) ); |
— | — | @@ -1838,6 +1840,7 @@ |
1839 | 1841 | } |
1840 | 1842 | } |
1841 | 1843 | function mv_jsdata_cb(response){ |
| 1844 | + js_log('mv_jsdata_cb'); |
1842 | 1845 | //run the callback from the global req cb object: |
1843 | 1846 | if(!global_req_cb[response['cb_inx']]){ |
1844 | 1847 | js_log('missing req cb index'); |
— | — | @@ -1853,7 +1856,7 @@ |
1854 | 1857 | break; |
1855 | 1858 | case 'text/xml': |
1856 | 1859 | if(typeof response['pay_load'] == 'string'){ |
1857 | | - js_log(response['pay_load']); |
| 1860 | + js_log('load string:'+ response['pay_load']); |
1858 | 1861 | //attempt to parse as xml for IE |
1859 | 1862 | if(embedTypes.msie){ |
1860 | 1863 | var xmldata=new ActiveXObject("Microsoft.XMLDOM"); |
— | — | @@ -1926,7 +1929,6 @@ |
1927 | 1930 | } |
1928 | 1931 | if (typeof DOMParser == "undefined") { |
1929 | 1932 | DOMParser = function () {} |
1930 | | - |
1931 | 1933 | DOMParser.prototype.parseFromString = function (str, contentType) { |
1932 | 1934 | if (typeof ActiveXObject != "undefined") { |
1933 | 1935 | var d = new ActiveXObject("MSXML.DomDocument"); |
— | — | @@ -1947,26 +1949,46 @@ |
1948 | 1950 | /* |
1949 | 1951 | * utility functions: |
1950 | 1952 | */ |
1951 | | -//if(typeof js_log == 'undefined'){ |
1952 | | - function js_log(string){ |
1953 | | - if( window.console ){ |
1954 | | - console.log(string); |
1955 | | - }else{ |
1956 | | - /* |
1957 | | - * IE and non-firebug debug: |
1958 | | - */ |
1959 | | - var log_elm = document.getElementById('mv_js_log'); |
1960 | | - /*if(!log_elm){ |
1961 | | - document.write('<div style="position:absolute;z-index:50;top:0px;left:0px;right:0px;height:150px;"><textarea id="mv_js_log" cols="80" rows="6"></textarea></div>'); |
1962 | | - var log_elm = document.getElementById('mv_js_log'); |
1963 | | - } |
1964 | | - if(log_elm){ |
1965 | | - log_elm.value+=string+"\n"; |
1966 | | - }*/ |
1967 | | - } |
1968 | | - } |
1969 | | -//} |
1970 | | -//report errors as alerts: |
| 1953 | +function js_log(string){ |
| 1954 | + if( window.console ){ |
| 1955 | + console.log(string); |
| 1956 | + }else{ |
| 1957 | + /* |
| 1958 | + * IE and non-firebug debug: |
| 1959 | + */ |
| 1960 | + /*var log_elm = document.getElementById('mv_js_log'); |
| 1961 | + if(!log_elm){ |
| 1962 | + document.write('<div style="position:absolute;z-index:500;top:0px;left:0px;right:0px;height:150px;"><textarea id="mv_js_log" cols="80" rows="6"></textarea></div>'); |
| 1963 | + var log_elm = document.getElementById('mv_js_log'); |
| 1964 | + } |
| 1965 | + if(log_elm){ |
| 1966 | + log_elm.value+=string+"\n"; |
| 1967 | + }*/ |
| 1968 | + } |
| 1969 | +} |
| 1970 | +function getNextHighestZindex(obj){ |
| 1971 | + var highestIndex = 0; |
| 1972 | + var currentIndex = 0; |
| 1973 | + var elArray = Array(); |
| 1974 | + if(obj){ elArray = obj.getElementsByTagName('*'); }else{ elArray = document.getElementsByTagName('*'); } |
| 1975 | + for(var i=0; i < elArray.length; i++){ |
| 1976 | + if (elArray[i].currentStyle){ |
| 1977 | + currentIndex = parseFloat(elArray[i].currentStyle['zIndex']); |
| 1978 | + }else if(window.getComputedStyle){ |
| 1979 | + currentIndex = parseFloat(document.defaultView.getComputedStyle(elArray[i],null).getPropertyValue('z-index')); |
| 1980 | + } |
| 1981 | + if(!isNaN(currentIndex) && currentIndex > highestIndex){ highestIndex = currentIndex; } |
| 1982 | + } |
| 1983 | + return(highestIndex+1); |
| 1984 | +} |
| 1985 | +function var_dump(obj) { |
| 1986 | + if(typeof obj == "object") { |
| 1987 | + return "Type: "+typeof(obj)+((obj.constructor) ? "\nConstructor: "+obj.constructor : "")+"\nValue: " + obj; |
| 1988 | + } else { |
| 1989 | + return "Type: "+typeof(obj)+"\nValue: "+obj; |
| 1990 | + } |
| 1991 | +} |
| 1992 | + |
1971 | 1993 | function js_error(string){ |
1972 | 1994 | alert(string); |
1973 | 1995 | } |
\ No newline at end of file |
Index: trunk/extensions/MetavidWiki/skins/mv_embed/mv_vlcEmbed.js |
— | — | @@ -9,6 +9,7 @@ |
10 | 10 | //init vars: |
11 | 11 | monitorTimerId : 0, |
12 | 12 | prevState : 0, |
| 13 | + currentTime:0, |
13 | 14 | userSlide:false, |
14 | 15 | getEmbedHTML : function(){ |
15 | 16 | //setup the interface controls if requested |
— | — | @@ -178,7 +179,8 @@ |
179 | 180 | onPlaying : function(){ |
180 | 181 | this.mediaLen = this.vlc.input.length; |
181 | 182 | //js_log('on playing:'+ this.mediaLen +' time:'+ this.vlc.input.time + ' p:'+this.vlc.input.position); |
182 | | - |
| 183 | + //update the currentTime attribute |
| 184 | + this.currentTime =this.vlc.input.time/1000; |
183 | 185 | if( this.mediaLen > 0 || this.vlc.input.time > 0){ |
184 | 186 | ///set mediaLen via request Url |
185 | 187 | if(this.mediaLen==0) |
— | — | @@ -266,7 +268,9 @@ |
267 | 269 | fullscreen : function(){ |
268 | 270 | this.vlc.video.toggleFullscreen(); |
269 | 271 | }, |
270 | | - /* returns current time in float seconds */ |
| 272 | + /* returns current time in float seconds |
| 273 | + * as per html5 we should just have an attribute by name of CurrentTime |
| 274 | + * http://www.whatwg.org/specs/web-apps/current-work/#currenttime |
271 | 275 | currentTime : function(){ |
272 | 276 | if(typeof this.vlc != 'undefined' ){ |
273 | 277 | if(typeof this.vlc.input != 'undefined' ){ |
— | — | @@ -275,6 +279,7 @@ |
276 | 280 | } |
277 | 281 | return '0'; |
278 | 282 | }, |
| 283 | + */ |
279 | 284 | // get the embed vlc object |
280 | 285 | getVLC : function getVLC(){ |
281 | 286 | this.vlc = this.getPluginEmbed(); |
Index: trunk/extensions/MetavidWiki/skins/mv_embed/sample_page.php |
— | — | @@ -39,13 +39,12 @@ |
40 | 40 | //$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">'; |
41 | 41 | //$sample_embed[1]['desc'] = 'Demo of json ROE attribute'; |
42 | 42 | |
43 | | -$sample_embed[2]['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">'; |
44 | | -$sample_embed[2]['desc'] = 'Demo2 of json ROE attribute'; |
| 43 | +//$sample_embed[2]['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">'; |
| 44 | +//$sample_embed[2]['desc'] = 'Demo2 of json ROE attribute'; |
45 | 45 | |
46 | 46 | |
47 | | -//$sample_embed[2]['tag'] = '<video id="v2" controls="true" style="width:400px;height:400px" |
48 | | -//roe="http://mammoth.dnip.net/wiki/index.php?title=Special:MvExportStream&feed_format=roe&stream_name=senate_11-14-05&t=0:42:14/0:42:56"/>'; |
49 | | -//$sample_embed[2]['desc'] = 'video with controls and thumbnail'; |
| 47 | +$sample_embed[2]['tag'] = '<video id="v2" controls="true" roe="http://mammoth.dnip.net/mvWiki/index.php?title=Special:MvExportStream&feed_format=roe&stream_name=senate_11-14-05&t=0:42:14/0:42:56"/>'; |
| 48 | +$sample_embed[2]['desc'] = 'video with controls and thumbnail'; |
50 | 49 | |
51 | 50 | |
52 | 51 | //playlist tags: |