Author: andre
Date: 2010-06-23 09:54:33 +0200 (Wed, 23 Jun 2010)
New Revision: 42660
Modified:
openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
Log:
restoring preview from div, webkit has something called 'Infinity' (?) in
duration
Modified: openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-06-23 06:42:20 UTC (rev 42659)
+++ openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-06-23 07:54:33 UTC (rev 42660)
@@ -61,10 +61,12 @@
$(div).find('div.player').append(player.player);
}
+
+ $(div).width(player.width).height(player.height);
+
var poster = createPoster(div, player);
$(div).prepend(poster);
-
- $(div).width(player.width).height(player.height);
+
if (config.controls && player.url != undefined) {
$(div).append(controlsHtml());
player.ctrls = $(div).find('div.controls');
@@ -95,7 +97,7 @@
$(div).addClass('inavailable');
$(div).append('<p>No compatible source found to play.</p>');
}
- //$.oiplayer.msg(player, player.info);
+ $.oiplayer.msg(player, player.info);
players.push(player);
}); // end for each
@@ -405,8 +407,8 @@
$(img).remove();
}
if (!src) {
- //return '<div class="preview ' + player.type + '" style="width:'
+ player.width + 'px;height:' + player.height + 'px;"></div>'
- return "";
+ return '<div class="preview ' + player.type + '" style="width:' +
player.width + 'px;height:' + player.height + 'px;"></div>'
+ //return "";
} else {
return '<img class="preview ' + player.type + '" src="' + src + '"
width="' + player.width + '" height="' + player.height + '" alt="click to play"
title="click to play" />';
}
@@ -658,7 +660,7 @@
var self = this;
this.player.addEventListener("durationchange",
function(ev) {
- if (!isNaN(self.player.duration) && self.player.duration > 0) {
+ if (!isNaN(self.player.duration) && self.player.duration > 0
&& self.player.duration != 'Infinity') {
self.duration = self.player.duration;
$.oiplayer.msg(self, "found duration: " + self.duration);
$.oiplayer.slider(self);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
