Mercurial Mercurial > festivalaix / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added OGG fallback
authorveltr
Thu, 20 Jun 2013 16:09:24 +0200
changeset 41 8d774f0b6182
parent 40 65b4e4674550
child 42 fc4808437c9e
Added OGG fallback
player/js/player.js file | annotate | diff | comparison | revisions 
--- a/player/js/player.js	Thu Jun 20 15:42:31 2013 +0200
+++ b/player/js/player.js	Thu Jun 20 16:09:24 2013 +0200
@@ -490,7 +490,7 @@
                 
                 var extension = (src.match(/\.([\d\w]+)$/) || ["",""])[1],
                     mimetype = annotationinfo.type + "/" + extension,
-                    fallbacks = { "video/webm": "mp4", "video/mp4": "webm" },
+                    fallbacks = { "video/webm": "mp4", "video/mp4": "webm", "audio/ogg": "mp3", "audio/mp3": "ogg" },
                     canPlay = document.createElement("video").canPlayType(mimetype);
                 
                 if (!canPlay) {
@@ -521,6 +521,8 @@
                 switch (annotationinfo.annotation.content.markup) {
                     case "html":
                         annotationDiv.find(".text-contents").html(text);
+                        
+                        //annotationDiv.find(".text-contents [style]").attr("style","");
 
                         var ps = annotationDiv.find(".text-contents>p"),
                             groups = [],
festivalaix