Author: andre Date: 2010-03-14 15:36:30 +0100 (Sun, 14 Mar 2010) New Revision: 41366
Modified: openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js Log: details Modified: openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css =================================================================== --- openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css 2010-03-14 14:23:42 UTC (rev 41365) +++ openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css 2010-03-14 14:36:30 UTC (rev 41366) @@ -14,7 +14,8 @@ div.oiplayer { width: 320px; } div.oiplayer span.duration, div.oiplayer span.start { display: none; } -div.oiplayer > div.player +div.oiplayer > div.player, +div.oiplayer > div.player > object { /*position: relative;*/ margin: 0; Modified: openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js =================================================================== --- openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js 2010-03-14 14:23:42 UTC (rev 41365) +++ openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js 2010-03-14 14:36:30 UTC (rev 41366) @@ -137,7 +137,7 @@ } else { $(div).find('.preview').css("z-index", "1"); } - $(div).find('div.player').show(); + $(div).find('div.player').show().height(player.height).width(player.width); if (player.info.indexOf("flash") < 0) { $(div).find('div.player').empty(); } @@ -168,23 +168,20 @@ player.width = player.owidth; player.height = player.oheight; } else if (multi_h < multi_w) { - player.width = player.owidth * multi_h; + player.width = Math.round(player.owidth * multi_h); player.height = window_h; - half = (window_w - player.width) / 2; + half = Math.floor((window_w - player.width) / 2); } else { player.width = window_w; - player.height = player.oheight * multi_w; + player.height = Math.round(player.oheight * multi_w); } $(div).toggleClass('fullscreen'); - $(div).find('div.player').width(player.width); + $(div).find('div.player').width(player.width).height(player.height); $(div).find('div.controls').width(player.width); $(div).find('div.controls li.slider').width(player.width - 170); - $(div).find('.preview').width(player.width); - $(div).find('.preview').height(player.height); - $(div).find('.preview').css('margin-left', half); - $(player.player).width(player.width); - $(player.player).height(player.height); + $(div).find('.preview').width(player.width).height(player.height).css('margin-left', half); + $(player.player).width(player.width).height(player.height); var pos; if (player.info.indexOf('flash') > -1) { pos = parseInt(player.position()); @@ -193,8 +190,7 @@ player.player.play(); } - $('div.player').find('object').attr("width", player.width); - $('div.player').find('object').attr("height", player.height); + $('div.player').find('object').attr("width", player.width).attr("height", player.height); if (player.info.indexOf('flash') > -1) { setTimeout(function() { player.seek(pos) }, 1500); // give fp time to reinitialize } _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs