Author: andre
Date: 2010-03-14 15:21:59 +0100 (Sun, 14 Mar 2010)
New Revision: 41364
Added:
openimages/trunk/src/main/webapp/oiplayer/css/images/preview_audio.png
Modified:
openimages/trunk/src/main/webapp/oiplayer/css/images/preview_video.png
openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css
openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
Log:
bit different approach with no poster attr.
Added: openimages/trunk/src/main/webapp/oiplayer/css/images/preview_audio.png
===================================================================
(Binary files differ)
Property changes on:
openimages/trunk/src/main/webapp/oiplayer/css/images/preview_audio.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: openimages/trunk/src/main/webapp/oiplayer/css/images/preview_video.png
===================================================================
(Binary files differ)
Modified: openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css 2010-03-13
11:07:15 UTC (rev 41363)
+++ openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css 2010-03-14
14:21:59 UTC (rev 41364)
@@ -16,10 +16,7 @@
div.oiplayer span.duration, div.oiplayer span.start { display: none; }
div.oiplayer > div.player
{
-/*
- position: relative;
- height: 240px;
-*/
+ /*position: relative;*/
margin: 0;
padding: 0;
}
@@ -27,8 +24,8 @@
div.oiplayer > div.controls
{
height: 24px;
- margin: 0;
-/*
+ margin: 4px 0 0 0;
+ /*
position: relative;
top: 0px;
left: 0;
@@ -48,6 +45,10 @@
*/
}
+div.oiplayer > div.preview { cursor: pointer; }
+div.oiplayer > div.preview.video { background: url(images/preview_video.png)
left top repeat; }
+div.oiplayer > div.preview.audio { background: url(images/preview_audio.png)
left top repeat; }
+
div.oiplayer audio, #msie_cortadoplayer_oiplayer
{
width: 320px;
@@ -59,7 +60,7 @@
*/
}
-div.inavailable
+div.oiplayer > div.inavailable
{
font-weight: bold;
height: 240px;
@@ -224,7 +225,7 @@
background-color: #fff;
}
-div.oiplayer.fullscreen > img.oipreview { margin: 0 auto; }
+div.oiplayer.fullscreen > img.preview { margin: 0 auto; }
div.oiplayer.fullscreen > div.player,
div.oiplayer.fullscreen > div.controls { margin: 0 auto; }
Modified: openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-03-13 11:07:15 UTC (rev 41363)
+++ openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-03-14 14:21:59 UTC (rev 41364)
@@ -58,7 +58,7 @@
//$('p.oiplayer-warn').hide(); // MSIE places stuff partly
outside mediatag
}
- $(div).find('img.oipreview').click(function(ev) {
+ $(div).find('.preview').click(function(ev) {
ev.preventDefault();
start(player, div);
});
@@ -133,9 +133,9 @@
/* Mainly user interface stuff on first start of playing */
function start(player, div) {
if (player.type == 'video') {
- $(div).find('img.oipreview').remove();
+ $(div).find('.preview').remove();
} else {
- $(div).find('img.oipreview').css("z-index", "1");
+ $(div).find('.preview').css("z-index", "1");
}
$(div).find('div.player').show();
if (player.info.indexOf("flash") < 0) {
@@ -180,9 +180,9 @@
$(div).find('div.player').width(player.width);
$(div).find('div.controls').width(player.width);
$(div).find('div.controls li.slider').width(player.width - 170);
- $(div).find('img.oipreview').width(player.width);
- $(div).find('img.oipreview').height(player.height);
- $(div).find('img.oipreview').css('margin-left', half);
+ $(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);
var pos;
@@ -349,12 +349,17 @@
function createPoster(el, player) {
var src = player.poster;
- if (src == undefined) { // for audio-tags (no attribute poster)
+ console.log("t: " + player.type + ", " + src);
+ if (!src && player.type == 'audio') { // for audio-tags (no attribute
poster)
var img = $(el).find('img')[0];
src = $(img).attr('src');
$(img).remove();
}
- return '<img src="' + src + '" alt="" class="oipreview" width="' +
player.width + '" height="' + player.height + '" />';
+ if (!src) {
+ return '<div class="preview ' + player.type + '" style="width:' +
player.width + 'px;height:' + player.height + 'px;"></div>'
+ } else {
+ return '<img src="' + src + '" width="' + player.width + '"
height="' + player.height + '" alt="click to play" title="click to play"
class="preview" />';
+ }
}
function createControls() {
@@ -369,10 +374,9 @@
}
function showInfo(player) {
- var text = player.info;
var id = player.id;
if ($('#' + id).find('div.playerinfo').length > 0) $('#' +
id).find('div.playerinfo').remove();
- $('#' + id).append('<div class="playerinfo">' + text + '</div>');
+ $('#' + id).append('<div class="playerinfo">' + player.info +
'</div>');
}
/*
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
