equal
deleted
inserted
replaced
105 _url = Mustache.to_html(this.ajax_url, { |
105 _url = Mustache.to_html(this.ajax_url, { |
106 media : _currentMedia.id, |
106 media : _currentMedia.id, |
107 begin : Math.max(0, _currentAnnotation.annotation.begin.milliseconds - this.ajax_granularity), |
107 begin : Math.max(0, _currentAnnotation.annotation.begin.milliseconds - this.ajax_granularity), |
108 end : Math.min(_currentMedia.duration.milliseconds, _currentAnnotation.annotation.end.milliseconds + this.ajax_granularity) |
108 end : Math.min(_currentMedia.duration.milliseconds, _currentAnnotation.annotation.end.milliseconds + this.ajax_granularity) |
109 }); |
109 }); |
110 console.log("Getting", _url); |
|
111 this.currentSource = this.player.loadMetadata(IriSP._.defaults({ |
110 this.currentSource = this.player.loadMetadata(IriSP._.defaults({ |
112 "url" : _url |
111 "url" : _url |
113 }, this.metadata)); |
112 }, this.metadata)); |
114 } |
113 } |
115 } |
114 } |