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 78	55b7d94593a1
parent 74	0405878fde82
child 80	c587eca9152e

equal deleted inserted replaced

-:3c47232648d6
+:55b7d94593a1
 $(".tags-title").mouseenter(function() {
 $(".tags-list").stop().slideDown();
 }).click(function() {
 if (clickedTag) {
-$(".found").removeClass("found");
-$(".timelines").removeClass("searching");
 clickedTag = null;
+showTag(null);
 }
 return false;
 });
 $(".tags").mouseleave(function() {
 $(".tags-list").stop().slideUp();
 function showTag(tagId) {
 $(".found").removeClass("found");
 var tag = myProject.getElement(tagId);
 if (tag) {
-$(".timelines").addClass("searching");
+$("body").addClass("searching");
+$(".tags-title").text(tag.title);
 tag.getRelated("annotation").forEach(function(a) {
 a.trigger("found-tags");
 });
 $(".tag[data-tag-id="+tagId+"]").addClass("found");
 } else {
-$(".timelines").removeClass("searching");
+$("body").removeClass("searching");
+$(".tags-title").text("Mots-clés");
 }
 lastTag = tagId;
 }
 $(".tag").hover(function() {
 showTag($(this).attr("data-tag-id"));
 }, function() {
 showTag(clickedTag);
 }).click(function() {
-if (clickedTag == lastTag) {
+var tag = $(this).attr("data-tag-id");
-clickedTag = null
+if (clickedTag === tag) {
+clickedTag = null;
 } else {
-clickedTag = lastTag;
+clickedTag = tag;
 }
+showTag(clickedTag);
 return false;
 });
 var chapters = myProject.getAnnotationsByTypeTitle("chapitrage"),
 + '<div class="chapter-block"></div><div class="chapter-title"><%- title %></div></li>'
 ),
 chapterList = $(".chapters-list"),
 hoveredChapter = null,
 currentChapter = null,
-currentChapterI = 0;
+currentChapterI = 0,
+slideInterval;
 function highlightChapter() {
 $(".chapter").removeClass("active");
 if (hoveredChapter || currentChapter) {
 (hoveredChapter || currentChapter).addClass("active");
 switch (annotationinfo.type) {
 case "slideshow":
 var currentslide = 0,
-slideInterval,
 playing = false,
 loaded = false,
 currentSlideLoaded = false,
 slides = annotationinfo.annotation.content.images;
 }
 loaded = slides.reduce(function(mem, slide) {
 return (mem && !!slide.image && !!slide.image.height);
 }, true);
 if (loaded) {
-if (annotationinfo.annotation.autostart && slides.length > 1) {
+if (annotationinfo.annotation.content.autostart && slides.length > 1) {
 togglePlay();
 }
 }
 }
 });
 checkloaded();
 if (slides.length > 1) {
-annotationDiv.find(".slideshow-next").click(nextImage);
+annotationDiv.find(".slideshow-next").click(function() {
+if (playing) {
+playing = false;
+togglePlay();
+}
+nextImage();
+});
 annotationDiv.find(".slideshow-previous").click(function() {
+if (playing) {
+playing = false;
+togglePlay();
+}
 currentslide = (currentslide ? currentslide : slides.length) - 1;
 annotationDiv.find(".slideshow-image").fadeTo(400, 0, showCurrentImage);
 });
 annotationDiv.find(".slideshow-play-pause").click(togglePlay);
 } else {
 }
 return false;
 });
 function fullScreen() {
-var isFull = document.fullScreen || document.mozFullScreen || document.webkitIsFullScreen,
+var isFull = document.fullScreen || document.mozFullScreen || document.webkitIsFullScreen || false,
 el = document.querySelector("body"),
 requestMethods = ["requestFullScreen","mozRequestFullScreen","webkitRequestFullScreen"],
 cancelMethods = ["cancelFullScreen","mozCancelFullScreen","webkitCancelFullScreen"];
 if (isFull) {
 for (var i = 0; i < cancelMethods.length; i++) {
 return false;
 }
 $(".full-screen").click(fullScreen);
 $(".top-bar").dblclick(fullScreen);
-var fsel = document.querySelector("body"),
+if ( typeof document.fullScreen === "undefined"
-fsRequestMethods = ["requestFullScreen","mozRequestFullScreen","webkitRequestFullScreen"],
+&& typeof document.mozFullScreen === "undefined"
-fsCapable = false;
+&& typeof document.webkitIsFullScreen === "undefined") {
-for (var i = 0; i < fsRequestMethods.length; i++) {
-if (typeof fsel[fsRequestMethods[i]] === "function") {
-fsCapable = true;
-break;
-}
-}
-if (!fsCapable) {
 $(".full-screen").remove();
 }
 $(".about").click(function() {
 closeAnnotation();
 aboutBox.find(".close-annotation").click(closeAnnotation);
 aboutBox.css({ top: Math.floor(($(".main-video").height() - aboutBox.height())/2)+"px" });
 });
 function closeAnnotation(e) {
+clearInterval(slideInterval);
 currentAnnotation = null;
 $(".chip, .pictolist li").removeClass("current");
 $(".timelines").removeClass("annotation-onscreen");
 $(".annotation audio, .annotation video").each(function() {
 try {

festivalaix