From 6be17d935d745f2f5fee1e713d984acfe33cba66 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Sat, 23 Apr 2011 21:33:01 +0200
Subject: [PATCH] fix videosupport

---
 pandora/templates/index.html            |  1 -
 static/js/jquery/jquery.videosupport.js | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pandora/templates/index.html b/pandora/templates/index.html
index 44336b9..8fe766d 100644
--- a/pandora/templates/index.html
+++ b/pandora/templates/index.html
@@ -4,7 +4,6 @@
         <title>{{settings.SITENAME}}</title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
         <link rel="shortcut icon" type="image/png" href="/static/png/icon.16.png"/>
-        <link rel="stylesheet" type="text/css" href="/static/oxjs/build/css/ox.ui.css"/>
 	<script type='text/javascript'>
 if(typeof(console)=='undefined') {
     console = {};
diff --git a/static/js/jquery/jquery.videosupport.js b/static/js/jquery/jquery.videosupport.js
index d54dffa..87c91fc 100644
--- a/static/js/jquery/jquery.videosupport.js
+++ b/static/js/jquery/jquery.videosupport.js
@@ -1,19 +1,29 @@
+// vim: et:ts=4:sw=4:sts=4:ft=js
 jQuery.support.video = function() {
     jQuery.browser.chrome = /chrome/.test(navigator.userAgent.toLowerCase());
     var video = {};
     var v = document.createElement('video');
     if (v) {
         video.support = true;
+
+        //get supported types
         video.webm = !!(v.canPlayType && v.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/no/, ''));
+        video.h264 = !!(v.canPlayType && v.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/, ''));
+        video.ogg = !!(v.canPlayType && v.canPlayType('video/ogg; codecs="theora, vorbis"').replace(/no/, ''));
+
         //Disable WebM on Safari/Perian, seeking does not work
-        if(video.webm && /safari/.test(navigator.userAgent.toLowerCase()) && ! /linux/.test(navigator.userAgent.toLowerCase())) {
+        if(!jQuery.browser.chrome &&
+            video.webm &&
+            /safari/.test(navigator.userAgent.toLowerCase()) &&
+            !/linux/.test(navigator.userAgent.toLowerCase())) {
             video.webm = false;
         }
-        video.h264 = !!(v.canPlayType && v.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/, ''));
-        if(jQuery.browser.chrome && video.webm)
+        //use webm if possible
+        if(jQuery.browser.chrome && video.webm) {
             video.h264 = false;
+        }
+        //aliases
         video.mp4 = video.h264;
-        video.ogg = !!(v.canPlayType && v.canPlayType('video/ogg; codecs="theora, vorbis"').replace(/no/, ''));
         video.ogv = video.ogg;
     } else {
         video.support = false;