Mercurial Mercurial > tralalere / 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.
Merge with 602df918fbc5d4b1fea9e062b8d60249f83378b9
authorcavaliet
Fri, 08 Jun 2012 17:56:29 +0200
changeset 44 f19a62040f98
parent 43 a621323f9525 (current diff)
parent 41 602df918fbc5 (diff)
child 47 11e17f300447
Merge with 602df918fbc5d4b1fea9e062b8d60249f83378b9
--- a/crea/integration/metadataplayer/LdtPlayer-core.js	Fri Jun 08 17:55:48 2012 +0200
+++ b/crea/integration/metadataplayer/LdtPlayer-core.js	Fri Jun 08 17:56:29 2012 +0200
@@ -2289,7 +2289,7 @@
                     media: _source.unNamespace(_data.getMedia().id),
                     title: _data.title,
                     type_title: _data.getAnnotationType().title,
-                    type: _source.unNamespace(_data.getAnnotationType().id)
+                    type: ( typeof _data.getAnnotationType().dont_send_id !== "undefined" && _data.getAnnotationType().dont_send_id ? "" : _source.unNamespace(_data.getAnnotationType().id) )
                 }
             }
         }
--- a/crea/integration/metadataplayer/MusitagAnnotations.js	Fri Jun 08 17:55:48 2012 +0200
+++ b/crea/integration/metadataplayer/MusitagAnnotations.js	Fri Jun 08 17:56:29 2012 +0200
@@ -17,7 +17,7 @@
     + '</div>';
 
 IriSP.Widgets.MusitagAnnotations.prototype.defaults = {
-    annotation_type: 'musitag',
+    annotation_type: false,
     columns: 15,
     max_by_column: 10,
     emoticons: ['happy', 'unhappy', 'laughing', 'surprised'],
--- a/crea/integration/metadataplayer/MusitagAnnotator.js	Fri Jun 08 17:55:48 2012 +0200
+++ b/crea/integration/metadataplayer/MusitagAnnotator.js	Fri Jun 08 17:56:29 2012 +0200
@@ -13,8 +13,8 @@
     api_serializer: "ldt_annotate",
     api_endpoint_template: "",
     api_method: "PUT",
-    close_widget_timeout: 5000,
-    annotation_type: "Musitag",
+    close_widget_timeout: 4000,
+    annotation_type: "contributions",
     creator_name: "musitag"
 };
 
@@ -221,6 +221,10 @@
         _emoticon = new IriSP.Model.Tag(false, _export),
         _url = Mustache.to_html(this.api_endpoint_template, {id: this.source.projectId});
     
+    if (!_annotationTypes.length) {
+        _annotationType.dont_send_id = true;
+    }
+    
     _color.title = this.annotation.color;
     _emoticon.title = this.annotation.emoticon;
 
--- a/crea/integration/player.html	Fri Jun 08 17:55:48 2012 +0200
+++ b/crea/integration/player.html	Fri Jun 08 17:56:29 2012 +0200
@@ -39,7 +39,7 @@
     IriSP.libFiles.defaultDir = "libs/";
     IriSP.widgetsDir = "metadataplayer";
     var _metadata = {
-        url: 'data/au-clair-de-la-lune.json',
+        url: 'http://192.168.56.101/musitag/tralalere/ldt/cljson/id/156c66cc-afe5-11e1-807a-58b035f6b93d',
         format: 'ldt'
     };
     var _config = {
--- a/web/tralalere/static/tralalere/metadataplayer/LdtPlayer-core.js	Fri Jun 08 17:55:48 2012 +0200
+++ b/web/tralalere/static/tralalere/metadataplayer/LdtPlayer-core.js	Fri Jun 08 17:56:29 2012 +0200
@@ -2289,7 +2289,7 @@
                     media: _source.unNamespace(_data.getMedia().id),
                     title: _data.title,
                     type_title: _data.getAnnotationType().title,
-                    type: _source.unNamespace(_data.getAnnotationType().id)
+                    type: ( typeof _data.getAnnotationType().dont_send_id !== "undefined" && _data.getAnnotationType().dont_send_id ? "" : _source.unNamespace(_data.getAnnotationType().id) )
                 }
             }
         }
--- a/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotations.js	Fri Jun 08 17:55:48 2012 +0200
+++ b/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotations.js	Fri Jun 08 17:56:29 2012 +0200
@@ -17,7 +17,7 @@
     + '</div>';
 
 IriSP.Widgets.MusitagAnnotations.prototype.defaults = {
-    annotation_type: 'musitag',
+    annotation_type: false,
     columns: 15,
     max_by_column: 10,
     emoticons: ['happy', 'unhappy', 'laughing', 'surprised'],
--- a/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotator.js	Fri Jun 08 17:55:48 2012 +0200
+++ b/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotator.js	Fri Jun 08 17:56:29 2012 +0200
@@ -13,8 +13,8 @@
     api_serializer: "ldt_annotate",
     api_endpoint_template: "",
     api_method: "PUT",
-    close_widget_timeout: 5000,
-    annotation_type: "Musitag",
+    close_widget_timeout: 4000,
+    annotation_type: "contributions",
     creator_name: "musitag"
 };
 
@@ -221,6 +221,10 @@
         _emoticon = new IriSP.Model.Tag(false, _export),
         _url = Mustache.to_html(this.api_endpoint_template, {id: this.source.projectId});
     
+    if (!_annotationTypes.length) {
+        _annotationType.dont_send_id = true;
+    }
+    
     _color.title = this.annotation.color;
     _emoticon.title = this.annotation.emoticon;
tralalere