PyukiWiki CVS Commit
pyuki****@lists*****
2012年 7月 31日 (火) 01:02:21 JST
Index: PyukiWiki-Devel/plugin/playvideo.inc.pl diff -u PyukiWiki-Devel/plugin/playvideo.inc.pl:1.184 PyukiWiki-Devel/plugin/playvideo.inc.pl:1.185 --- PyukiWiki-Devel/plugin/playvideo.inc.pl:1.184 Tue Jul 31 00:12:47 2012 +++ PyukiWiki-Devel/plugin/playvideo.inc.pl Tue Jul 31 01:02:21 2012 @@ -1,6 +1,6 @@ ###################################################################### # playvideo.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: playvideo.inc.pl,v 1.184 2012/07/30 15:12:47 papu Exp $ +# $Id: playvideo.inc.pl,v 1.185 2012/07/30 16:02:21 papu Exp $ # # "playvideo" ver 2.2b $$ # Author: Nanami http://nanakochi.daiba.cx/ @@ -425,7 +425,7 @@ <script type="text/javascript"><!-- var swf="$::skin_url/video-js.swf"; //--></script> -<script src="$::skin_url/video.js" type="text/javascript"></script> +<script src="$::skin_url/video.js" type="text/javascript"></sc9ript> EOM } $playvideo::htmlplayer++; @@ -588,6 +588,29 @@ return $tag; } +sub html5videoposter { + my($file,$path,$videourl,%videourls)=@_; + + my $agent=$ENV{HTTP_USER_AGENT}; + my $tag=""; + my $url; + + if(($url=&checkurl($file,"jpg",$path,$videourl,%videourls)) ne '') { + return $url; + } + if(($url=&checkurl($file,"png",$path,$videourl,%videourls)) ne '') { + return $url; + } + if(($url=&checkurl($file,"gif",$path,$videourl,%videourls)) ne '') { + return $url; + } + if(($url=&checkurl($file,"jpeg",$path,$videourl,%videourls)) ne '') { + return $url; + } + return ""; +} + + sub checkurl { my ($file,$ext,$path,$url,%urls)=@_; if(-r "$path/$file.$ext") { Index: PyukiWiki-Devel/plugin/playvideo_v_cgi.pl diff -u PyukiWiki-Devel/plugin/playvideo_v_cgi.pl:1.108 PyukiWiki-Devel/plugin/playvideo_v_cgi.pl:1.109 --- PyukiWiki-Devel/plugin/playvideo_v_cgi.pl:1.108 Tue Jul 31 00:25:39 2012 +++ PyukiWiki-Devel/plugin/playvideo_v_cgi.pl Tue Jul 31 01:02:21 2012 @@ -1,6 +1,6 @@ ###################################################################### # playvideo_v_cgi.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: playvideo_v_cgi.pl,v 1.108 2012/07/30 15:25:39 papu Exp $ +# $Id: playvideo_v_cgi.pl,v 1.109 2012/07/30 16:02:21 papu Exp $ # # "playvideo" ver 2.2b $$ # Author: Nanami http://nanakochi.daiba.cx/ @@ -399,6 +399,7 @@ if($ext eq $vhtml) { $html5videotag=&html5video($file,$videopath,$videourl,%::playvideo_plugin_videourl); + $poster=&html5videoposter($file,$videopath,$videourl,%::playvideo_plugin_videourl); if(&checkhtml5videosupport eq 1) { $bottom=24; $body=<<EOM; @@ -428,14 +429,11 @@ <div id="page"> <div class="video-js-box" id="player"> EOM - if($ENV{HTTP_USER_AGENT}=~/iPod|iPhone|iPad|Android/) { + if($ENV{HTTP_USER_AGENT}=~/iPod|iPhone|iPad|Android/ || 1) { $body.=<<EOM; -<video id="playvideo" class="video-js vjs-default-skin" width="$width" height="$height" controls="controls" preload="none" autoplay="none" data-setup="{}"@{[$loopflg ne 0 ? ' loop="loop"' : '']}> +<video id="playvideo" class="video-js vjs-default-skin" width="$width" height="$height" controls="controls" preload="none" onclick="this.play();"@{[$poster ne "" ? qq( poster="$poster") : ""]} data-setup="{}"@{[$loopflg ne 0 ? ' loop="loop"' : '']}> $html5videotag </video> -<script type="text/javascript"><!-- -playvideo.play(); -//--></script> </div> EOM } else { @@ -445,6 +443,7 @@ </video> </div> EOM + } } else { $body.=<<EOM
