festivalaix: comparison player/js/player.js

Mercurial Mercurial > festivalaix / comparison

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

player/js/player.js

changeset 69	ce5cdc22fbe4
parent 65	1da0c1382b07
child 71	af98a6dc9381

equal deleted inserted replaced

-:b163a938e9c3
+:ce5cdc22fbe4
 }];
 }
 }
 );
+function preventRightClick(selector) {
+selector.on("contextmenu", function() {
+return false;
+});
+}
+preventRightClick($(".video-container video"));
 $(".media-duration").text(myMedia.duration);
 myMedia.on("timeupdate", function(t) {
 var pos = (100 * t / myMedia.duration) + "%";
 $(".media-position").text(t);
 slide.description.split(/\n/gm).map(function(l) {
 return '<p>' + _.escape(l) + '</p>';
 }).join("")
 );
 imgel.fadeTo(400, 1);
+preventRightClick(imgel);
 }
 var nextImage = function() {
 currentslide = (currentslide + 1) % slides.length;
 annotationDiv.find(".slideshow-image").fadeTo(400, 0, showCurrentImage);
 success: function(data) {
 annotationDiv.find(".media-frame").html(data.html);
 positionDiv();
 }
 });
-return;
+break;
 }
 if (/^(https?:\/\/)?(www\.)?dailymotion/.test(src)) {
 $.ajax({
 url: "http://www.dailymotion.com/services/oembed",
 success: function(data) {
 annotationDiv.find(".media-frame").html(data.html);
 positionDiv();
 }
 });
-return;
+break;
 }
 if (/^(https?:\/\/)?(www\.)?soundcloud\.com/.test(src)) {
 $.ajax({
 url: "http://soundcloud.com/oembed",
 success: function(data) {
 annotationDiv.find(".media-frame").html(data.html);
 positionDiv();
 }
 });
-return;
+break;
 }
 var extension = (src.match(/\.([\d\w]+)$/) || ["",""])[1],
 mimetype = annotationinfo.type + "/" + extension,
 fallbacks = { "video/webm": "mp4", "video/mp4": "webm", "audio/ogg": "mp3", "audio/mp3": "ogg" },
 media.on("loadedmetadata", function() {
 positionDiv();
 });
+preventRightClick(media);
 annotationDiv.find(".media-frame").html(media);
-return;
 break;
 case "text":
 var text = annotationinfo.annotation.content.text || annotationinfo.annotation.description;
 switch (annotationinfo.annotation.content.markup) {
 case "html":
 annotationDiv.find(".text-contents").html(text);
-var ps = annotationDiv.find(".text-contents>p"),
-groups = [],
-last, group;
-ps.each(function(i, e) {
-if (last && group && last.nextElementSibling === e) {
-group.contents.push(e);
-} else {
-group = {
-master: e,
-contents: [e.cloneNode(true)]
-}
-groups.push(group);
-}
-last = e;
-});
-groups.forEach(function(g) {
-$(g.master).replaceWith($('<div class="column-group">').append(g.contents));
-});
 break;
 default:
 annotationDiv.find(".text-contents").html(
 text.split(/\n/gm).map(function(l) {
 return '<p>' + _.escape(l) + '</p>';
 }).join("")
 );
 break;
 }
 annotationDiv.find(".text-contents a").attr("target","_blank");
+annotationDiv.find(".text-contents").css({
+"max-height": $(".main-video").height() - 140
+});
 break;
 case "link":
 var linkTemplate = _.template('<p><a href="<%- url %>" target="_blank"><%- title %></a></p>');
 annotationDiv.find(".link-contents").html(
 annotationinfo.annotation.content.links.map(linkTemplate).join("")
-);
+).css({
+"max-height": $(".main-video").height() - 140
-break;
+});
-}
+break;
-positionDiv(true);
+}
+positionDiv();
 }
 $(".video-container").click(function() {
 if (currentAnnotation) {

festivalaix