Author: andre
Date: 2010-03-04 16:05:19 +0100 (Thu, 04 Mar 2010)
New Revision: 41267
Modified:
openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css
openimages/trunk/src/main/webapp/oiplayer/index.html
openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
Log:
stop jugling div's, flash and others same now
Modified: openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css 2010-03-04
14:14:59 UTC (rev 41266)
+++ openimages/trunk/src/main/webapp/oiplayer/css/oiplayer.css 2010-03-04
15:05:19 UTC (rev 41267)
@@ -23,17 +23,13 @@
background-color: #fff;
}
-div.oiplayer > div.player,
-div.oiplayer div.oiplayer-flash
-{
+div.oiplayer > div.player {
position: relative;
height: 240px;
margin: 0 0 8px 0;
padding: 0;
}
-/* div.oiplayer div.oiplayer-flash { position: relative; } */
-
div.oiplayer > div.controls
{
height: 24px;
Modified: openimages/trunk/src/main/webapp/oiplayer/index.html
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/index.html 2010-03-04
14:14:59 UTC (rev 41266)
+++ openimages/trunk/src/main/webapp/oiplayer/index.html 2010-03-04
15:05:19 UTC (rev 41267)
@@ -18,8 +18,10 @@
<div id="clientcaps"> </div> <!-- div#clientcaps is needed for Java
detection in MSIE -->
<video controls="controls"
poster="http://www.openimages.eu/images/18489/WEEKNUMMER364-HRE0000D9C6.png";>
+<!--
<source type="video/ogg; codecs=theora"
src="http://www.openimages.eu/files/09/9734.9730.WEEKNUMMER364-HRE0000D9C6.ogv";>
</source>
<source type="video/ogg; codecs=theora"
src="http://www.openimages.eu/files/09/9737.9730.WEEKNUMMER364-HRE0000D9C6.ogv";>
</source>
+ -->
<source type="video/mp4; codecs=unknown"
src="http://www.openimages.eu/files/09/9740.9730.WEEKNUMMER364-HRE0000D9C6.mp4";>
</source>
</video>
@@ -42,7 +44,8 @@
</li>
<li>
Enable the jQuery plugin on all HTML5 video or audio tags.
- In this example on all pages with a body with class 'oiplayerexample'
(see f.e. 'js/play.js').
+ In this example on all pages with a body with class 'oiplayerexample'
+ (see f.e. '<a href="js/play.js">js/play.js</a>').
<pre>
$(document).ready(function() {
$('body.oiplayer-example').oiplayer({ 'controls' : true });
Modified: openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
===================================================================
--- openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-03-04 14:14:59 UTC (rev 41266)
+++ openimages/trunk/src/main/webapp/oiplayer/js/jquery.oiplayer.js
2010-03-04 15:05:19 UTC (rev 41267)
@@ -47,20 +47,19 @@
}
$(mt).wrap('<div class="oiplayer"><div
class="player"></div></div>');
- var div = $(mt).parent('div.player');
+ var div = $(mt).closest('div.oiplayer');
+
var player = createPlayer(mt, sources, config);
+ $(div).find('div.player').hide(); // .remove() would indefinitely
loop MSIE
+
+ var poster = createPoster(self, player); // using self (complete
input) for MSIE
+ $(div).prepend(poster);
//console.log("info: " + player.info);
- var poster = createPoster(self, player); // using self (complete
input) for MSIE
- if ($.browser.msie || player.myname == 'flowplayer') {
- $('p.oiplayer-warn').hide(); // MSIE places stuff partly
outside mediatag
- $(div).find('div.oiplayer-flash').hide(); // .remove() would
indefinitely loop MSIE
- } else {
- $(div).empty();
+ if ($.browser.msie) {
+ //$('p.oiplayer-warn').hide(); // MSIE places stuff partly
outside mediatag
}
- $(div).prepend(poster);
-
- /* click preview: play */
+
$(div).find('img.oipreview').click(function(ev) {
ev.preventDefault();
if (player.type == 'video') {
@@ -68,8 +67,7 @@
} else {
$(div).find('img.oipreview').css("z-index", "1");
}
- $(div).find('div.oiplayer-flash').show();
- $(div).append(player.player);
+ $(div).find('div.player').show();
$(player.player).css("z-index", "9");
player.play();
if (config.controls == true) {
@@ -81,14 +79,14 @@
});
if (config.controls == true) {
- $(div).after(createControls());
+ $(div).append(createControls());
/* click play/pause button */
- var ctrls = $(div).next('div.controls');
+ var ctrls = $(div).find('ul.controls');
var timer = $(ctrls).find('li.position');
+ //console.log("init: " + player.state);
$(ctrls).find('li.play a').click(function(ev) {
ev.preventDefault();
- console.log("click");
if (player.state == 'pause') {
player.play();
if ($(ctrls).find('li.pause').length == 0) {
@@ -102,8 +100,7 @@
if (player.type == 'video') {
$(div).find('img.oipreview').remove();
}
- $(div).find('div.oiplayer-flash').show();
- $(div).append(player.player);
+ $(div).find('div.player').show();
player.play();
if ($(ctrls).find('li.pause').length == 0) {
$(ctrls).find('li.play').addClass('pause');
@@ -113,8 +110,10 @@
//console.log("player state: " + player.state);
});
$(ctrls).find('li.sound a').click(function(ev){
- player.mute();
- $(ctrls).find('li.sound').toggleClass('off');
+ if (player.state != 'init') {
+ player.mute();
+ $(ctrls).find('li.sound').toggleClass('off');
+ }
});
}
@@ -560,8 +559,12 @@
var duration = (this.duration == undefined ? 0 :
Math.round(this.duration));
var div = document.createElement('div'); // TODO: add (random) id: adding
flowplayer and returning it impossible without id
- $(el).parent('div.player').html(div);
+ /*
+ $(el).closest('div.player').html(div);
$(div).addClass('oiplayer-flash');
+ */
+ $(el).closest('div.oiplayer').html(div);
+ $(div).addClass('player');
this.player = $f(div, { src : flwplayer, width : this.width, height :
this.height }, {
clip: {
url: this.url,
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
![http://www.openimages.eu/images/18489/WEEKNUMMER364-HRE0000D9C6.png"](http://www.openimages.eu/images/18489/WEEKNUMMER364-HRE0000D9C6.png"){kind=link}