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.
Corrected empty project bug
authorveltr
Tue, 12 Jun 2012 12:45:47 +0200
changeset 62 c56d8f2447a2
parent 60 c9c34daf1fe6
child 63 7fdd51822e5b
Corrected empty project bug
crea/integration/metadataplayer/LdtPlayer-core.js file | annotate | diff | comparison | revisions
crea/integration/metadataplayer/MusitagAnnotator.js file | annotate | diff | comparison | revisions
crea/integration/player.html file | annotate | diff | comparison | revisions
web/tralalere/static/tralalere/metadataplayer/LdtPlayer-core.js file | annotate | diff | comparison | revisions
web/tralalere/static/tralalere/metadataplayer/MusitagAnnotator.js file | annotate | diff | comparison | revisions 
--- a/crea/integration/metadataplayer/LdtPlayer-core.js	Mon Jun 11 18:55:50 2012 +0200
+++ b/crea/integration/metadataplayer/LdtPlayer-core.js	Tue Jun 12 12:45:47 2012 +0200
@@ -2199,9 +2199,9 @@
             return;
         }
         IriSP._(this.types).forEach(function(_type, _typename) {
-            var _listdata = _data[_type.serialized_name];
+            var _listdata = _data[_type.serialized_name],
+                _list = new IriSP.Model.List(_source.directory);
             if (typeof _listdata !== "undefined" && _listdata !== null) {
-                var _list = new IriSP.Model.List(_source.directory);
                 if (_listdata.hasOwnProperty("length")) {
                     var _l = _listdata.length;
                     for (var _i = 0; _i < _l; _i++) {
@@ -2210,8 +2210,8 @@
                 } else {
                     _list.push(_type.deserializer(_listdata, _source));
                 }
-                _source.addList(_typename, _list);
             }
+            _source.addList(_typename, _list);
         });
         
         if (typeof _data.meta !== "undefined") {
--- a/crea/integration/metadataplayer/MusitagAnnotator.js	Mon Jun 11 18:55:50 2012 +0200
+++ b/crea/integration/metadataplayer/MusitagAnnotator.js	Tue Jun 12 12:45:47 2012 +0200
@@ -254,6 +254,7 @@
         },
         error: function(_xhr, _error, _thrown) {
             IriSP.log("Error when sending annotation", _thrown);
+            _export.getAnnotations().removeElement(_annotation, true);
             _this.showScreen('Error');
             window.setTimeout(function(){
                 _this.showScreen("Main");
--- a/crea/integration/player.html	Mon Jun 11 18:55:50 2012 +0200
+++ b/crea/integration/player.html	Tue Jun 12 12:45:47 2012 +0200
@@ -56,7 +56,7 @@
     IriSP.libFiles.defaultDir = "libs/";
     IriSP.widgetsDir = "metadataplayer";
     var _metadata = {
-        url: 'http://192.168.56.101/musitag/tralalere/ldt/cljson/id/156c66cc-afe5-11e1-807a-58b035f6b93d',
+        url: 'data/au-clair-de-la-lune.json',
         format: 'ldt'
     };
     var _config = {
--- a/web/tralalere/static/tralalere/metadataplayer/LdtPlayer-core.js	Mon Jun 11 18:55:50 2012 +0200
+++ b/web/tralalere/static/tralalere/metadataplayer/LdtPlayer-core.js	Tue Jun 12 12:45:47 2012 +0200
@@ -2199,9 +2199,9 @@
             return;
         }
         IriSP._(this.types).forEach(function(_type, _typename) {
-            var _listdata = _data[_type.serialized_name];
+            var _listdata = _data[_type.serialized_name],
+                _list = new IriSP.Model.List(_source.directory);
             if (typeof _listdata !== "undefined" && _listdata !== null) {
-                var _list = new IriSP.Model.List(_source.directory);
                 if (_listdata.hasOwnProperty("length")) {
                     var _l = _listdata.length;
                     for (var _i = 0; _i < _l; _i++) {
@@ -2210,8 +2210,8 @@
                 } else {
                     _list.push(_type.deserializer(_listdata, _source));
                 }
-                _source.addList(_typename, _list);
             }
+            _source.addList(_typename, _list);
         });
         
         if (typeof _data.meta !== "undefined") {
--- a/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotator.js	Mon Jun 11 18:55:50 2012 +0200
+++ b/web/tralalere/static/tralalere/metadataplayer/MusitagAnnotator.js	Tue Jun 12 12:45:47 2012 +0200
@@ -254,6 +254,7 @@
         },
         error: function(_xhr, _error, _thrown) {
             IriSP.log("Error when sending annotation", _thrown);
+            _export.getAnnotations().removeElement(_annotation, true);
             _this.showScreen('Error');
             window.setTimeout(function(){
                 _this.showScreen("Main");
tralalere