diff -r 0b710028f3d3 -r 60ca7678f074 integration/js/mashupcore.js --- a/integration/js/mashupcore.js Mon Aug 26 13:06:12 2013 +0200 +++ b/integration/js/mashupcore.js Tue Oct 01 16:16:07 2013 +0200 @@ -12,7 +12,7 @@ width: k * _s.duration, color: _s.color, segmentid: _s.annotation.id - } + }; vizhtml += viztemplate(vizdata); t += _s.duration.milliseconds; }); @@ -148,7 +148,7 @@ height: (2 + _size) + "px", width: (2 + _size) + "px", "margin-left": -Math.ceil(2 + _size / 2) + "px" - } + }; } /* Controller Widget */ @@ -189,7 +189,7 @@ .addClass("Ldt-Ctrl-Sound-Mute"); } else { _soundCtl.attr("title", gettext("mute")) - .addClass(_vol < .5 ? "Ldt-Ctrl-Sound-Half" : "Ldt-Ctrl-Sound-Full" ) + .addClass(_vol < .5 ? "Ldt-Ctrl-Sound-Half" : "Ldt-Ctrl-Sound-Full" ); } volBar.slider("value", _muted ? 0 : 100 * _vol); volBar.attr("title",gettext("Volume:") + Math.floor(100 * _vol) + '%'); @@ -220,14 +220,14 @@ $(".Ldt-Ctrl-Play") .attr("title", gettext("Pause")) .removeClass("Ldt-Ctrl-Play-PlayState") - .addClass("Ldt-Ctrl-Play-PauseState") + .addClass("Ldt-Ctrl-Play-PauseState"); } function onCurrentMediaPause() { $(".Ldt-Ctrl-Play") .attr("title", gettext("Play")) .removeClass("Ldt-Ctrl-Play-PauseState") - .addClass("Ldt-Ctrl-Play-PlayState") + .addClass("Ldt-Ctrl-Play-PlayState"); } function onCurrentMediaTimeupdate(_time) { @@ -354,7 +354,7 @@ media.loaded = true; media.trigger("loadedmetadata"); media.trigger("volumechange"); - }) + }); videoSelector.on("timeupdate", function() { media.trigger("timeupdate", new IriSP.Model.Time(1000*videoElement.currentTime)); @@ -363,7 +363,7 @@ videoSelector.on("volumechange", function() { getVolume(); media.trigger("volumechange"); - }) + }); videoSelector.on("play", function() { media.trigger("play"); @@ -380,11 +380,11 @@ videoSelector.on("seeked", function() { media.trigger("seeked"); }); - } + }; media.hide = function() { $("#" + videoid).remove(); - } + }; // Binding functions to Media Element Functions @@ -563,7 +563,7 @@ mashup.on("add", function() { mashup.getMedias().forEach(addMedia); - }) + }); mashup.on("change",updateMashupUI); @@ -610,7 +610,7 @@ if (segment) { mashup.setCurrentTime(segment.begin); } - }) + }); project.on("set-current", function(media) { currentMedia = media; @@ -650,11 +650,11 @@ .mouseleave(function() { project.trigger("mouseout-annotation"); mouseoverSegment = undefined; - }) + }); mashup.trigger("add"); -} +}; /* END mashupcore.js */