theend: comparison integration/js/contentplayer.js

Mercurial Mercurial > theend / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

integration/js/contentplayer.js

changeset 73	fb4d0566ab19
parent 64	458cc4576415
child 81	a2befc2110c1

equal deleted inserted replaced

-:07d4049eec01
+:fb4d0566ab19
 currentMedia,
 globalTags = {},
 seqCount;
 var ratio = 2.37;
+if (typeof window.localStorage !== "undefined" && window.localStorage.getItem !== "undefined") {
+var resolution = window.localStorage.getItem("resolution") || "SD";
+} else {
+var resolution = "SD";
+}
+var video_url_transform = function(url) {
+return url.replace(/[SH]D(\.[a-z0-9]+)$/,resolution + "$1");
+}
 function resizeVideo() {
 var currentwidth = $(window).width(),
 maxheight = $(window).height() - 220,
 height = Math.min(maxheight, currentwidth / ratio),
 segmentdragin = segmentdragout.find("ul")
 segmentdragging = false;
 function resizeSegmentDrag() {
 var segmentdelta = segmentdragout.width() - segmentdragin.width();
-segmentdragin.draggable("option","containment",segmentdelta < 0 ? [ segmentdelta - 20, 0, 20, 0 ] : "parent")
+segmentdragin.draggable("option","containment",segmentdelta < 0 ? [ segmentdelta - 20, 0, 20, 0 ] : "parent");
+if (segmentdelta < 0 && currentSegment && $("#title_sequence li").length) {
+var x = $("#title_sequence li[data-segment-id='" + currentSegment.id + "']").offset().left - segmentdragin.offset().left;
+segmentdragin.css("left", Math.max(segmentdelta - 20, Math.min( 20, 36 - x)))
+}
 }
 segmentdragin.draggable({
 axis: "x",
 start: function() {
 var tagsdragout = $("#tag_sequence"),
 tagsdragin = tagsdragout.find("ul")
 tagsdragging = false;
-function resizeTagsDrag() {
+function resizeTagsDrag(toRight) {
 var tagsdelta = tagsdragout.width() - tagsdragin.width();
 tagsdragin.draggable("option","containment",tagsdelta < 0 ? [ tagsdelta - 20, 0, 20, 0 ] : "parent");
-tagsdragin.css("left",Math.floor(tagsdelta/2));
+tagsdragin.css("left",(toRight && tagsdelta < 0) ? tagsdelta - 20 : Math.floor(tagsdelta/2));
 }
 tagsdragin.draggable({
 axis: "x",
 start: function() {
 contentType: 'application/json',
 data: _export.serialize(), /* L'objet Source est sérialisé */
 success: function(_data) {
 var n = 1 + (segmentAtPost.__tags[_tagvalue] || 0)
 segmentAtPost.__tags[_tagvalue] = n;
-showCurrentTags();
+showCurrentTags(_tagvalue);
 },
 error: function(_xhr, _error, _thrown) {
 console.log("Error when sending annotation", _thrown);
 }
 });
 s.on("enter", function() {
 currentSegment = s;
 showCurrentTags();
 $("#title_sequence li").removeClass("here");
 $("#title_sequence li[data-segment-id='" + s.id + "']").addClass("here");
+resizeSegmentDrag();
 });
 });
 segmentdragin.html(segmentsHtml);
 resizeSegmentDrag();
 currentMedia.play();
 });
-function showCurrentTags() {
+function showCurrentTags(tagToShow) {
 var vals = _(currentSegment.__tags).values(),
 max = Math.max.apply(Math, vals),
 min = Math.min(max - 1, Math.min.apply(Math, vals)),
-b = 160 / (max - min);
+b = 160 / (max - min),
-var html = _(currentSegment.__tags)
+tagList = _(currentSegment.__tags).map(function(v, k) {
-.chain()
+return {
-.map(function(v, k) {
+label: k,
-var c = Math.floor( 95 + (v - min) * b );
+weight: v
-return '<li><a href="'
+}
-+ IriSP.endpoints.tag_page.replace("__TAG__",encodeURIComponent(k))
+});
+tagList = _(tagList).shuffle();
+if (tagToShow && currentSegment.__tags[tagToShow]) {
+tagList = tagList.filter(function(t) {
+return (t.label !== tagToShow);
+});
+tagList.push({
+label: tagToShow,
+weight: currentSegment.__tags[tagToShow]
+});
+}
+var html = tagList.reduce(
+function(memo, tag) {
+var c = Math.floor( 95 + (tag.weight - min) * b );
+return memo + '<li><a href="'
++ IriSP.endpoints.tag_page.replace("__TAG__",encodeURIComponent(tag.label))
 + '" style="color: rgb('
 + [c,c,c].join(",")
 + ')">'
-+ k
++ tag.label
-+ ' </a> </li>'
++ ' </a> </li>';
-})
+},
-.shuffle()
+"");
-.value()
-.join("");
 tagsdragin.html(html);
-resizeTagsDrag();
+resizeTagsDrag(!!tagToShow);
 }
 function addMedia(media) {
 if (media.has_player) {
 return;
 }
 media.has_player = true;
 media.loaded = false;
 media.paused = true;
-var videourl = media.video;
+var videourl = video_url_transform(media.video),
-if (typeof IriSP.video_url_transform === "function") {
+videoid = "video_" + media.id,
-videourl = IriSP.video_url_transform(media.video);
-}
-var videoid = "video_" + media.id,
 videoEl = $('<video>'),
 mp4_file = videourl.replace(/\.webm$/i,'.mp4'),
 webm_file = videourl.replace(/\.mp4$/i,'.webm'),
 mediaEl = videoEl[0],
 can_play_mp4 = !!mediaEl.canPlayType('video/mp4'),
 timeSlider.slider("value", slidersRange * _time / media.duration);
 });
 }
+$(".sdhdgroup").addClass(resolution);
+$(".sdhdbtn").click(function() {
+var newres = $(this).attr("title");
+if (resolution !== newres) {
+window.localStorage.setItem("resolution", newres);
+document.location.reload();
+}
+return false;
+});
+$("#btnInfo, .lightBoxClose").click(function() {
+$(".lightBoxWrap").toggle();
+return false;
+});
 }

theend