Author: andre Date: 2010-06-25 18:48:22 +0200 (Fri, 25 Jun 2010) New Revision: 42714
Modified: openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js Log: mute/volume controll is not supported on ipad, when .flv is present use that over .mp4 for flash/flowplayer Modified: openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js =================================================================== --- openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js 2010-06-25 14:00:18 UTC (rev 42713) +++ openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js 2010-06-25 16:48:22 UTC (rev 42714) @@ -343,10 +343,18 @@ if (proposal.type == undefined) { var flash_url; for (var i = 0; i < types.length; i++) { - if (types[i].indexOf("video/mp4") > -1 || types[i].indexOf("video/flv") > -1 + if (types[i].indexOf("video/flv") > -1) { + proposal.url = urls[i]; + proposal.type = "flash"; + return proposal; + } + } + for (var i = 0; i < types.length; i++) { + if (types[i].indexOf("video/mp4") > -1 /* || types[i].indexOf("video/mpeg") > -1 */ ) { proposal.url = urls[i]; proposal.type = "flash"; + return proposal; } } } @@ -434,7 +442,7 @@ '<div class="sliderwrap"><div class="slider"><div> </div></div></div>' + '<div class="timeleft">-00:00</div>' + '</li>' + - '<li class="sound"><a title="mute" href="#sound">mute</a></li>' + + (isIpad() ? '' : '<li class="sound"><a title="mute" href="#sound">mute</a></li>') + (player.type == 'video' ? '<li class="screen"><a title="fullscreen" href="#fullscreen">fullscreen</a></li>' : '') + '</ul></div>'; } _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs