diff -r 0b710028f3d3 -r 60ca7678f074 integration/js/editor.js --- a/integration/js/editor.js Mon Aug 26 13:06:12 2013 +0200 +++ b/integration/js/editor.js Tue Oct 01 16:16:07 2013 +0200 @@ -5,7 +5,7 @@ max = (typeof maxlength === "undefined" ? min + 20 : maxlength), rx = new RegExp("(^.{" + min + "," + max + "})[\s].+$"); return text.replace(/[\n\r\s]+/mg,' ').replace(rx,'$1…'); - } + }; /* Load Media List */ @@ -111,7 +111,7 @@ var mashupwarning = [ { validate: function(_m) { - return !!_m.description + return !!_m.description; }, message: gettext("A hashcut should have a description") } @@ -190,7 +190,7 @@ corrpos = Math.max(76, Math.min(156, pos)), line = IriSP._(lines).find(function(line) { return !IriSP._(line.annotations).find(function(ann) { - return ann.begin < _a.end && ann.end > _a.begin + return ann.begin < _a.end && ann.end > _a.begin; }); }); if (!line) { @@ -209,7 +209,7 @@ tags: _a.keywords.join(", ").replace(replace, '$1'), popleft : corrpos, pointerpos : (pos - corrpos), - } + }; html += mediafoundtemplate(vizdata); }); html = mediafoundlisttemplate({ @@ -222,7 +222,7 @@ li.hide(); } } - }) + }); }); /* Fill right column when mashup is updated */ @@ -358,7 +358,7 @@ }); currentSegment.status = critical ? "critical" : (warning ? "warning" : "valid"); if (!messages.length) { - messages.push(gettext("This segment is valid!")) + messages.push(gettext("This segment is valid!")); } currentSegment.status_messages = _(messages); @@ -446,7 +446,7 @@ corrpos = Math.max(145, Math.min(305, pos)), line = IriSP._(lines).find(function(line) { return !IriSP._(line.annotations).find(function(ann) { - return ann.begin < _a.end && ann.end > _a.begin + return ann.begin < _a.end && ann.end > _a.begin; }); }); if (!line) { @@ -463,7 +463,7 @@ top: 8 * line.index, pointerpos : (pos - corrpos), color: IriSP.vizcolors[i % IriSP.vizcolors.length] - } + }; html += mediasegmenttemplate(vizdata); }); return mediasegmentlisttemplate({ @@ -593,7 +593,7 @@ /* Click on segments */ function reorganizeMashup() { - var ids = $(".organize-segments .item-video").map(function(){return $(this).attr("data-segment-id")}); + var ids = $(".organize-segments .item-video").map(function(){return $(this).attr("data-segment-id");}); mashup.setAnnotationsById(ids); } @@ -614,7 +614,7 @@ } } if (currentMedia === mashup && mashup.currentMedia) { - mediaid = mashup.currentMedia.id + mediaid = mashup.currentMedia.id; } $(".media[data-media-id='" + mediaid + "']").addClass("active"); }); @@ -834,7 +834,7 @@ $("#hashcut-form").submit(function() { $(".update-title").hide(); return false; - }) + }); /* Publication */ @@ -850,7 +850,7 @@ return false; } var postproject = directory.newLocalSource(), - medias = mashup.getMedias() + medias = mashup.getMedias(), annotations = mashup.getOriginalAnnotations(); postproject.addList("annotationType"); postproject.addList("tag"); @@ -863,7 +863,7 @@ annotations.forEach(function(_a) { _a.setAnnotationType( postproject.getAnnotationTypes().filter( - function(_at) { return _at.media === _a.getMedia() } + function(_at) { return _at.media === _a.getMedia(); } )[0].id); var tagids = []; _(_a.keywords).each(function(keyword) { @@ -914,6 +914,6 @@ }); mashup.trigger("change"); -} +}; /* END editor.js */