--- a/src/metadatacomposer/__init__.py Wed Jun 19 17:50:32 2013 +0200
+++ b/src/metadatacomposer/__init__.py Thu Jun 20 16:22:31 2013 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 1, 2, "final", 0)
+VERSION = (0, 1, 3, "final", 0)
def get_version():
--- a/src/metadatacomposer/static/metadatacomposer/js/player.js Wed Jun 19 17:50:32 2013 +0200
+++ b/src/metadatacomposer/static/metadatacomposer/js/player.js Thu Jun 20 16:22:31 2013 +0200
@@ -20,10 +20,10 @@
url_transform: function(src) {
return [{
type: "video/mp4",
- src: src.replace(/\.[\d\w]+$/,'.mp4').replace('rtmp://media.iri.centrepompidou.fr/ddc_player', 'http://media.iri.centrepompidou.fr')
+ src: src.replace(/\.[\d\w]+$/,'.mp4')
}, {
type: "video/webm",
- src: src.replace(/\.[\d\w]+$/,'.webm').replace('rtmp://media.iri.centrepompidou.fr/ddc_player', 'http://media.iri.centrepompidou.fr')
+ src: src.replace(/\.[\d\w]+$/,'.webm')
}];
}
}
@@ -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 = [],