diff -r 92506f22f7cd -r d7bcf5f39b6c player/js/ldt-serializer.js --- a/player/js/ldt-serializer.js Thu May 23 13:11:56 2013 +0200 +++ b/player/js/ldt-serializer.js Fri May 24 18:49:09 2013 +0200 @@ -131,6 +131,7 @@ } _res.color = '#' + _c; } + _res.content = _data.content; _res.setMedia(_data.media); _res.setAnnotationType(_data.meta["id-ref"]); _res.setTags(IriSP._(_data.tags).pluck("id-ref")); @@ -153,14 +154,22 @@ id : _data.id, begin : _data.begin.milliseconds, end : _data.end.milliseconds, - content : { - title : _data.title || "", - description : _data.description || "", - audio : _data.audio, - img: { - src: _data.thumbnail + content : IriSP._.defaults( + {}, + { + title : _data.title, + description : _data.description, + audio : _data.audio, + img: { + src: _data.thumbnail + } + }, + _data.content, + { + title: "", + description: "" } - }, + ), color: _color, media : _data.media.id, meta : { @@ -177,6 +186,7 @@ } }) } + _res.content.title = _data.title || _res.content.title || ""; _dest.annotations.push(_res); } },