diff -r 2c025db10a10 -r d777d05a16e4 src/js/serializers/CinecastSerializer.js --- a/src/js/serializers/CinecastSerializer.js Wed Apr 18 18:58:44 2012 +0200 +++ b/src/js/serializers/CinecastSerializer.js Thu Apr 19 19:20:41 2012 +0200 @@ -116,15 +116,15 @@ }, begin : _data.begin.milliseconds, end : _data.begin.milliseconds, - media : _source.unNamespace(_data.media.contents), - type : _source.unNamespace(_data.annotationType.contents), + media : _source.unNamespace(_data.media.id), + type : _source.unNamespace(_data.annotationType.id), meta : { created : IriSP.Model.dateToIso(_data.created), creator : _data.creator, creator_name : _data.title }, - tags : _data.getTags().map(function(_el) { - return _source.unNamespace(_el.id) + tags : _data.tag.id.map(function(_id) { + return _source.unNamespace(_id) }) } } @@ -154,7 +154,13 @@ }); return _res; }, + loadData : function(_url, _callback) { + IriSP.jQuery.getJSON(_url, _callback) + }, deSerialize : function(_data, _source) { + if (typeof _data !== "object" && _data === null) { + return; + } if (typeof _data.imports !== "undefined") { IriSP._(_data.imports).forEach(function(_import) { _source.directory.namespaces[_import.id] = _import.url;