Author: andre
Date: 2010-03-01 20:52:15 +0100 (Mon, 01 Mar 2010)
New Revision: 41212
Modified:
openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
Log:
some bugfixes (mainly involving flowplayer), width and height must always be set
Modified: openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-03-01 15:56:43 UTC (rev 41211)
+++ openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-03-01 19:52:15 UTC (rev 41212)
@@ -101,6 +101,7 @@
if (player.type == 'video') {
$(div).find('img.oipreview').remove();
}
+ $(div).find('div.oiplayer-flash').show();
$(div).append(player.player);
player.play();
if ($(ctrls).find('li.pause').length == 0) {
@@ -365,10 +366,8 @@
if (this.autobuffer == undefined) this.autobuffer = false;
this.controls = $(this.player).attr('controls');
if (this.controls == undefined) this.controls = false;
- this.width = $(this.player).attr('width');
- this.height = $(this.player).attr('height');
- if (typeof(this.width) == "undefined") this.width = $("head
meta[name=media-width]").attr("content");
- if (typeof(this.height) == "undefined") this.height = $("head
meta[name=media-height]").attr("content");
+ this.width = $(this.player).attr('width') > 0 ?
$(this.player).attr('width') : 320;
+ this.height = $(this.player).attr('height') > 0 ?
$(this.player).attr('height') : 240;;
this.duration = $("head meta[name=media-duration]").attr("content"); //
not a mediatag attr.
this.state = 'init';
this.pos = 0;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
