src/js/serializers/JSONSerializer.js
branchpopcorn-port
changeset 601 02b857c0c9f1
parent 595 29d86e6c61a6
child 610 7533dd920805
equal deleted inserted replaced
600:4e669328ab6d 601:02b857c0c9f1
   234 IriSP.JSONSerializer.prototype.currentAnnotations = function(currentTime, id) {
   234 IriSP.JSONSerializer.prototype.currentAnnotations = function(currentTime, id) {
   235   var view;
   235   var view;
   236   var currentTimeMs = 1000 * currentTime;
   236   var currentTimeMs = 1000 * currentTime;
   237 
   237 
   238   if (typeof(id) === "undefined") {
   238   if (typeof(id) === "undefined") {
   239     id = this.getChapitrage();
       
   240   
       
   241     if (typeof(id) === "undefined")    
       
   242       var legal_ids = this.getNonTweetIds();
   239       var legal_ids = this.getNonTweetIds();
   243     else 
   240   } else {
   244       legal_ids = [id];
   241       legal_ids = [id];
   245   }
   242   }
   246   
   243   
   247   var ret_array = [];
   244   var ret_array = [];
   248   
   245