From fd07fcbc71765528767d28c92b0070e50f73be2f Mon Sep 17 00:00:00 2001 From: Brian Holland Date: Fri, 16 Apr 2010 13:35:03 +0000 Subject: Update JWPlayer to level 5.1 --- modules/JWplayer/flvVideo.php | 28 ++++- modules/JWplayer/player.swf | Bin 42566 -> 86736 bytes modules/JWplayer/swfobject.js | 270 +----------------------------------------- modules/JWplayer/yt.swf | Bin 1210 -> 1136 bytes 4 files changed, 28 insertions(+), 270 deletions(-) (limited to 'modules') diff --git a/modules/JWplayer/flvVideo.php b/modules/JWplayer/flvVideo.php index 80c2c842ff..31b1d31db8 100644 --- a/modules/JWplayer/flvVideo.php +++ b/modules/JWplayer/flvVideo.php @@ -45,8 +45,32 @@ global $pid, $GEDCOM ; global $flvVideo, $SERVER_URL; $flvVideo="../../".decrypt(safe_GET('flvVideo')); $preview=""; +// echo "".$flvVideo.""; ?> + + + + +
Get the Flash Player to see this player.
+ + + diff --git a/modules/JWplayer/player.swf b/modules/JWplayer/player.swf index 7a36433a8a..292241910e 100644 Binary files a/modules/JWplayer/player.swf and b/modules/JWplayer/player.swf differ diff --git a/modules/JWplayer/swfobject.js b/modules/JWplayer/swfobject.js index 08cbe896c0..e7edd42c09 100644 --- a/modules/JWplayer/swfobject.js +++ b/modules/JWplayer/swfobject.js @@ -1,8 +1,3 @@ -/* swfobject.js - Author Brian Holland .... email webman@windmillway.f2s.com - * @package webtrees - * @subpackage Module - * @version $Id$ -*/ /** * SWFObject v1.5: Flash Player detection and embed - http://blog.deconcept.com/swfobject/ * @@ -10,267 +5,4 @@ * http://www.opensource.org/licenses/mit-license.php * */ -if(typeof deconcept=="undefined"){ - var deconcept=new Object(); -} -if(typeof deconcept.util=="undefined"){ - deconcept.util=new Object(); -} -if(typeof deconcept.SWFObjectUtil=="undefined"){ - deconcept.SWFObjectUtil=new Object(); -} -deconcept.SWFObject=function(_1,id,w,h,_5,c,_7,_8,_9,_a){ - if(!document.getElementById){ - return; - } - this.DETECT_KEY=_a?_a:"detectflash"; - this.skipDetect=deconcept.util.getRequestParameter(this.DETECT_KEY); - this.params=new Object(); - this.variables=new Object(); - this.attributes=new Array(); - if(_1){ - this.setAttribute("swf",_1); - } - if(id){ - this.setAttribute("id",id); - } - if(w){ - this.setAttribute("width",w); - } - if(h){ - this.setAttribute("height",h); - } - if(_5){ - this.setAttribute("version",new deconcept.PlayerVersion(_5.toString().split("."))); - } - this.installedVer=deconcept.SWFObjectUtil.getPlayerVersion(); - if(!window.opera&&document.all&&this.installedVer.major>7){ - deconcept.SWFObject.doPrepUnload=true; - }if(c){ - this.addParam("bgcolor",c); - } - var q=_7?_7:"high"; - this.addParam("quality",q); - this.setAttribute("useExpressInstall",false); - this.setAttribute("doExpressInstall",false); - var _c=(_8)?_8:window.location; - this.setAttribute("xiRedirectUrl",_c); - this.setAttribute("redirectUrl",""); - if(_9){ - this.setAttribute("redirectUrl",_9); - } -}; - -deconcept.SWFObject.prototype={ - useExpressInstall:function(_d){ - this.xiSWFPath=!_d?"expressinstall.swf":_d; - this.setAttribute("useExpressInstall",true); - }, - setAttribute:function(_e,_f){ - this.attributes[_e]=_f; - }, - getAttribute:function(_10){ - return this.attributes[_10]; - }, - addParam:function(_11,_12){ - this.params[_11]=_12; - }, - getParams:function(){ - return this.params; - }, - addVariable:function(_13,_14){ - this.variables[_13]=_14; - }, - getVariable:function(_15){ - return this.variables[_15]; - }, - getVariables:function(){ - return this.variables; - }, - getVariablePairs:function(){ - var _16=new Array(); - var key; - var _18=this.getVariables(); - for(key in _18){ - _16[_16.length]=key+"="+_18[key]; - } - return _16; - }, - - getSWFHTML:function(){ - var _19=""; - if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length){ - if(this.getAttribute("doExpressInstall")){ - this.addVariable("MMplayerType","PlugIn"); - this.setAttribute("swf",this.xiSWFPath); - } - _19 ="0){ - _19+="flashvars=\""+_1c+"\""; - } - _19+="/>"; - }else{ - if(this.getAttribute("doExpressInstall")){ - this.addVariable("MMplayerType","ActiveX"); - this.setAttribute("swf",this.xiSWFPath); - } - _19 =""; - _19+=""; - var _1d=this.getParams(); - for(var key in _1d){ - _19+=""; - } - var _1f=this.getVariablePairs().join("&"); - if(_1f.length>0){ - _19+=""; - } - _19+=""; - } - return _19; - }, - - write:function(_20){ - if(this.getAttribute("useExpressInstall")){ - var _21=new deconcept.PlayerVersion([6,0,65]); - if(this.installedVer.versionIsValid(_21)&&!this.installedVer.versionIsValid(this.getAttribute("version"))){ - this.setAttribute("doExpressInstall",true); - this.addVariable("MMredirectURL",escape(this.getAttribute("xiRedirectUrl"))); - document.title=document.title.slice(0,47)+" - Flash Player Installation"; - this.addVariable("MMdoctitle",document.title); - } - } - if(this.skipDetect||this.getAttribute("doExpressInstall")||this.installedVer.versionIsValid(this.getAttribute("version"))){ - var n=(typeof _20=="string")?document.getElementById(_20):_20;n.innerHTML=this.getSWFHTML(); - return true; - }else{ - if(this.getAttribute("redirectUrl")!=""){ - document.location.replace(this.getAttribute("redirectUrl")); - } - } - return false; - } -}; - -deconcept.SWFObjectUtil.getPlayerVersion=function(){ - var _23=new deconcept.PlayerVersion([0,0,0]); - if(navigator.plugins&&navigator.mimeTypes.length){ - var x=navigator.plugins["Shockwave Flash"]; - if(x&&x.description){ - _23=new deconcept.PlayerVersion(x.description.replace(/([a-zA-Z]|\s)+/,"").replace(/(\s+r|\s+b[0-9]+)/,".").split(".")); - } - }else{ - if(navigator.userAgent&&navigator.userAgent.indexOf("Windows CE")>=0){ - var axo=1; - var _26=3; - while(axo){ - try{ - _26++;axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash."+_26); - _23=new deconcept.PlayerVersion([_26,0,0]); - } - catch(e){ - axo=null; - } - } - }else{ - try{ - var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7"); - } - catch(e){ - try{ - var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6"); - _23=new deconcept.PlayerVersion([6,0,21]); - axo.AllowScriptAccess="always"; - } - catch(e){ - if(_23.major==6){ - return _23; - } - } - try{ - axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash"); - } - catch(e){} - } - if(axo!=null){ - _23=new deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(",")); - } - } - } - return _23; -}; - -deconcept.PlayerVersion=function(_29){ - this.major=_29[0]!=null?parseInt(_29[0]):0; - this.minor=_29[1]!=null?parseInt(_29[1]):0; - this.rev=_29[2]!=null?parseInt(_29[2]):0; -}; - -deconcept.PlayerVersion.prototype.versionIsValid=function(fv){ - if(this.majorfv.major){return true;} - if(this.minorfv.minor){return true;} - if(this.rev=0;i--){ - _2f[i].style.display="none"; - for(var x in _2f[i]){ - if(typeof _2f[i][x]=="function"){ - _2f[i][x]=function(){}; - } - } - } -}; - -if(deconcept.SWFObject.doPrepUnload){ - if(!deconcept.unloadSet){ - deconcept.SWFObjectUtil.prepUnload=function(){ - __flash_unloadHandler=function(){}; - __flash_savedUnloadHandler=function(){}; - window.attachEvent("onunload",deconcept.SWFObjectUtil.cleanupSWFs); - }; - window.attachEvent("onbeforeunload",deconcept.SWFObjectUtil.prepUnload); - deconcept.unloadSet=true; - } -} - -if(!document.getElementById&&document.all){ - document.getElementById=function(id){ - return document.all[id]; - }; -} - -var getQueryParamValue=deconcept.util.getRequestParameter; -var FlashObject=deconcept.SWFObject; -var SWFObject=deconcept.SWFObject; - - - \ No newline at end of file +if(typeof deconcept=="undefined"){var deconcept=new Object();}if(typeof deconcept.util=="undefined"){deconcept.util=new Object();}if(typeof deconcept.SWFObjectUtil=="undefined"){deconcept.SWFObjectUtil=new Object();}deconcept.SWFObject=function(_1,id,w,h,_5,c,_7,_8,_9,_a){if(!document.getElementById){return;}this.DETECT_KEY=_a?_a:"detectflash";this.skipDetect=deconcept.util.getRequestParameter(this.DETECT_KEY);this.params=new Object();this.variables=new Object();this.attributes=new Array();if(_1){this.setAttribute("swf",_1);}if(id){this.setAttribute("id",id);}if(w){this.setAttribute("width",w);}if(h){this.setAttribute("height",h);}if(_5){this.setAttribute("version",new deconcept.PlayerVersion(_5.toString().split(".")));}this.installedVer=deconcept.SWFObjectUtil.getPlayerVersion();if(!window.opera&&document.all&&this.installedVer.major>7){deconcept.SWFObject.doPrepUnload=true;}if(c){this.addParam("bgcolor",c);}var q=_7?_7:"high";this.addParam("quality",q);this.setAttribute("useExpressInstall",false);this.setAttribute("doExpressInstall",false);var _c=(_8)?_8:window.location;this.setAttribute("xiRedirectUrl",_c);this.setAttribute("redirectUrl","");if(_9){this.setAttribute("redirectUrl",_9);}};deconcept.SWFObject.prototype={useExpressInstall:function(_d){this.xiSWFPath=!_d?"expressinstall.swf":_d;this.setAttribute("useExpressInstall",true);},setAttribute:function(_e,_f){this.attributes[_e]=_f;},getAttribute:function(_10){return this.attributes[_10];},addParam:function(_11,_12){this.params[_11]=_12;},getParams:function(){return this.params;},addVariable:function(_13,_14){this.variables[_13]=_14;},getVariable:function(_15){return this.variables[_15];},getVariables:function(){return this.variables;},getVariablePairs:function(){var _16=new Array();var key;var _18=this.getVariables();for(key in _18){_16[_16.length]=key+"="+_18[key];}return _16;},getSWFHTML:function(){var _19="";if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length){if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","PlugIn");this.setAttribute("swf",this.xiSWFPath);}_19="0){_19+="flashvars=\""+_1c+"\"";}_19+="/>";}else{if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","ActiveX");this.setAttribute("swf",this.xiSWFPath);}_19="";_19+="";var _1d=this.getParams();for(var key in _1d){_19+="";}var _1f=this.getVariablePairs().join("&");if(_1f.length>0){_19+="";}_19+="";}return _19;},write:function(_20){if(this.getAttribute("useExpressInstall")){var _21=new deconcept.PlayerVersion([6,0,65]);if(this.installedVer.versionIsValid(_21)&&!this.installedVer.versionIsValid(this.getAttribute("version"))){this.setAttribute("doExpressInstall",true);this.addVariable("MMredirectURL",escape(this.getAttribute("xiRedirectUrl")));document.title=document.title.slice(0,47)+" - Flash Player Installation";this.addVariable("MMdoctitle",document.title);}}if(this.skipDetect||this.getAttribute("doExpressInstall")||this.installedVer.versionIsValid(this.getAttribute("version"))){var n=(typeof _20=="string")?document.getElementById(_20):_20;n.innerHTML=this.getSWFHTML();return true;}else{if(this.getAttribute("redirectUrl")!=""){document.location.replace(this.getAttribute("redirectUrl"));}}return false;}};deconcept.SWFObjectUtil.getPlayerVersion=function(){var _23=new deconcept.PlayerVersion([0,0,0]);if(navigator.plugins&&navigator.mimeTypes.length){var x=navigator.plugins["Shockwave Flash"];if(x&&x.description){_23=new deconcept.PlayerVersion(x.description.replace(/([a-zA-Z]|\s)+/,"").replace(/(\s+r|\s+b[0-9]+)/,".").split("."));}}else{if(navigator.userAgent&&navigator.userAgent.indexOf("Windows CE")>=0){var axo=1;var _26=3;while(axo){try{_26++;axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash."+_26);_23=new deconcept.PlayerVersion([_26,0,0]);}catch(e){axo=null;}}}else{try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");}catch(e){try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");_23=new deconcept.PlayerVersion([6,0,21]);axo.AllowScriptAccess="always";}catch(e){if(_23.major==6){return _23;}}try{axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");}catch(e){}}if(axo!=null){_23=new deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(","));}}}return _23;};deconcept.PlayerVersion=function(_29){this.major=_29[0]!=null?parseInt(_29[0]):0;this.minor=_29[1]!=null?parseInt(_29[1]):0;this.rev=_29[2]!=null?parseInt(_29[2]):0;};deconcept.PlayerVersion.prototype.versionIsValid=function(fv){if(this.majorfv.major){return true;}if(this.minorfv.minor){return true;}if(this.rev=0;i--){_2f[i].style.display="none";for(var x in _2f[i]){if(typeof _2f[i][x]=="function"){_2f[i][x]=function(){};}}}};if(deconcept.SWFObject.doPrepUnload){if(!deconcept.unloadSet){deconcept.SWFObjectUtil.prepUnload=function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){};window.attachEvent("onunload",deconcept.SWFObjectUtil.cleanupSWFs);};window.attachEvent("onbeforeunload",deconcept.SWFObjectUtil.prepUnload);deconcept.unloadSet=true;}}if(!document.getElementById&&document.all){document.getElementById=function(id){return document.all[id];};}var getQueryParamValue=deconcept.util.getRequestParameter;var FlashObject=deconcept.SWFObject;var SWFObject=deconcept.SWFObject; \ No newline at end of file diff --git a/modules/JWplayer/yt.swf b/modules/JWplayer/yt.swf index 5b41e4da2a..881ec8b35c 100644 Binary files a/modules/JWplayer/yt.swf and b/modules/JWplayer/yt.swf differ -- cgit v1.3