Author: andre
Date: 2010-03-16 19:57:59 +0100 (Tue, 16 Mar 2010)
New Revision: 41445
Modified:
openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
Log:
simpler, cortado did not work
Modified: openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-03-16 18:46:45 UTC (rev 41444)
+++ openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-03-16 18:57:59 UTC (rev 41445)
@@ -35,6 +35,7 @@
controls : true
};
if (settings) $.extend(config, settings);
+ var self = this;
var players = new Array();
this.each(function() {
var mediatags = $(this).find('video, audio');
@@ -50,9 +51,13 @@
var div = $(mt).closest('div.oiplayer');
var player = createPlayer(mt, sources, config);
$(div).addClass(player.type);
- //console.log("info: " + player.info);
- var poster = createPoster(self, player);
+ if (player.myname.indexOf('cortado') > -1) {
+ $(div).find('div.player').empty();
+ $(div).find('div.player').append(player.player);
+ }
$(div).find('div.player').hide();
+
+ var poster = createPoster(div, player);
$(div).prepend(poster);
if ($.browser.msie) {
@@ -69,16 +74,10 @@
/* html ready, bind controls */
$.each(players, function(i, pl) {
- var el;
- if (pl.myname == 'flowplayer') {
- el = $(pl.player.getParent()).closest('div.oiplayer');
- } else {
- el = $(pl.player).closest('div.oiplayer');
- }
-
+ var el = $.oiplayer.div(pl);
$(el).find('.preview').click(function(ev) {
ev.preventDefault();
- start(pl, el);
+ start(pl);
});
if (config.controls) {
@@ -96,7 +95,7 @@
pl.pause();
$(ctrls).find('li.play').removeClass('pause');
} else {
- start(pl, el);
+ start(pl);
}
//console.log("player state: " + pl.state);
});
@@ -120,11 +119,11 @@
max: Math.round(pl.duration)
});
$(ctrls).find("div.slider > div").bind('slide',
function(ev, ui) {
- newPos(pl, ctrls, ui.value);
+ pos(pl, ui.value);
});
$(ctrls).find("div.slider > div").bind('slidechange',
function(ev, ui) {
if (ev.originalEvent.type == "mouseup") {
- newPos(pl, ctrls, ui.value);
+ pos(pl, ui.value);
}
});
}
@@ -135,8 +134,9 @@
return this; // plugin convention
});
- function newPos(player, ctrls, pos) {
+ function pos(player, pos) {
player.seek(pos);
+ var ctrls = $( $.oiplayer.div(player) ).find('ul.controls');
$(ctrls).find('li.position').text( $.oiplayer.totime(pos) );
if (pos > 0) {
$(ctrls).find('li.slider').addClass("changed");
@@ -146,20 +146,17 @@
}
/* Mainly user interface stuff on first start of playing */
- function start(player, div) {
+ function start(player) {
+ var div = $.oiplayer.div(player);
if (player.type == 'video') {
$(div).find('.preview').remove();
} else {
$(div).find('.preview').css("z-index", "1");
}
$(div).find('div.player').show().height(player.height).width(player.width);
- if (player.info.indexOf("flash") < 0) {
- $(div).find('div.player').empty();
- }
- $(div).find('div.player').append(player.player);
// for audio? $(player.player).css("z-index", "9");
player.play();
- if (player.config.controls == true) {
+ if (player.config.controls) {
var ctrls = $(div).find('ul.controls');
var timer = $(ctrls).find('li.position');
if ($(ctrls).find('li.pause').length == 0) {
@@ -169,7 +166,8 @@
}
}
- function fullscreen(player, div) {
+ function fullscreen(player) {
+ var div = $.oiplayer.div(player);
if (typeof(player.owidth) == "undefined") {
player.owidth = player.width;
player.oheight = player.height;
@@ -198,13 +196,12 @@
$(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) {
+ if (player.myname == 'flowplayer') {
pos = parseInt(player.position());
//player.player.getScreen().animate({width:player.width,height:player.height});
player.player.unload();
player.player.play();
}
-
$('div.player').find('object').attr("width",
player.width).attr("height", player.height);
if (player.myname == 'flowplayer') {
setTimeout(function() { player.seek(pos) }, 1500); // give fp
time to reinitialize
@@ -448,6 +445,17 @@
}, 200);
},
+ /*
+ * Returns div player is wrapped in
+ */
+ div: function(player) {
+ if (player.myname == 'flowplayer') {
+ return $(player.player.getParent()).closest('div.oiplayer');
+ } else {
+ return $(player.player).closest('div.oiplayer');
+ }
+ },
+
totime: function (pos) {
function toTime(sec) {
var h = Math.floor(sec / 3600);
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
