--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.settings/org.eclipse.php.core.prefs Mon Feb 13 17:36:06 2012 +0100
@@ -0,0 +1,3 @@
+#Sat Sep 24 15:42:33 CEST 2011
+eclipse.preferences.version=1
+include_path=
--- a/src/js/serializers/JSONSerializer.js Mon Feb 13 15:32:51 2012 +0100
+++ b/src/js/serializers/JSONSerializer.js Mon Feb 13 17:36:06 2012 +0100
@@ -26,19 +26,21 @@
var self = this;
- var fn = function(data) {
- self._data = data;
- if (typeof(self._data["annotations"]) === "undefined" ||
- self._data["annotations"] === null)
- self._data["annotations"] = [];
-
- // sort the data too
- self._data["annotations"].sort(function(a, b)
- { var a_begin = +a.begin;
- var b_begin = +b.begin;
- return a_begin - b_begin;
- });
-
+ var fn = function(data) {
+ //TODO: seems taht data can be null here
+ if (data !== null) {
+ self._data = data;
+ if (typeof(self._data["annotations"]) === "undefined" ||
+ self._data["annotations"] === null)
+ self._data["annotations"] = [];
+
+ // sort the data too
+ self._data["annotations"].sort(function(a, b)
+ { var a_begin = +a.begin;
+ var b_begin = +b.begin;
+ return a_begin - b_begin;
+ });
+ }
callback(data);
};
--- a/src/js/widgets/annotationsWidget.js Mon Feb 13 15:32:51 2012 +0100
+++ b/src/js/widgets/annotationsWidget.js Mon Feb 13 17:36:06 2012 +0100
@@ -16,7 +16,7 @@
IriSP.AnnotationsWidget.prototype.displayAnnotation = function(annotation) {
var title = annotation.content.title;
var description = annotation.content.description;
- var keywords = "" // FIXME;
+ var keywords = "";
var begin = +annotation.begin / 1000;
var end = +annotation.end / 1000;
var duration = +this._serializer.currentMedia().meta["dc:duration"];
--- a/src/js/widgets/createAnnotationWidget.js Mon Feb 13 15:32:51 2012 +0100
+++ b/src/js/widgets/createAnnotationWidget.js Mon Feb 13 17:36:06 2012 +0100
@@ -409,7 +409,8 @@
var jsonString = JSON.stringify(apiJson);
var project_id = this._serializer._data.meta.id;
- var url = Mustache.to_html("{{platf_url}}/ldtplatform/api/ldt/projects/{{id}}.json",
+ //TODO: extract magic url
+ var url = Mustache.to_html("{{platf_url}}/ldtplatform/api/ldt/annotations/{{id}}.json",
{platf_url: IriSP.platform_url, id: project_id});
IriSP.jQuery.ajax({