X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=files%2Fpr0n-fullscreen.js;h=df64c0743222d50d30037c362e2b6f47fa70a1f1;hb=989d4ee34212a6db5037e4b3abf8a1dd6384f807;hp=181a82cb1e0745bde78677c7c02ca5ab16b6c74f;hpb=8e147d49e7c7a81680bdf14f77c0d0e227aaa6c6;p=pr0n

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 181a82c..df64c07 100644
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -58,18 +58,20 @@ function reduce_to_fixed_width(size)
 		[ 120, 96 ],
 		[ 80, 64 ]
 	];
+	var i;
 	for (i = 0; i < fixed_sizes.length; ++i) {
-		if (size[0] >= fixed_sizes[i][0] && size[1] >= fixed_sizes[i][1])
+		if (size[0] >= fixed_sizes[i][0] && size[1] >= fixed_sizes[i][1]) {
 			return fixed_sizes[i];
+		}
 	}
 	return [ 80, 64 ];
 }
 	
 function display_image(width, height, evt, filename, element_id)
 {
-	var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/" + filename;
+	var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/" + global_infobox + filename;
 	var img = document.getElementById(element_id);
-	if (img != null) {
+	if (img !== null) {
 		img.src = "data:";
 		img.parentNode.removeChild(img);
 	}
@@ -92,7 +94,7 @@ function prepare_preload(img, width, height, evt, filename)
 {
 	// cancel any pending preload
 	var preload = document.getElementById("preload");
-	if (preload != null) {
+	if (preload !== null) {
 		preload.src = "data:";
 		preload.parentNode.removeChild(preload);
 	}
@@ -106,28 +108,14 @@ function prepare_preload(img, width, height, evt, filename)
 	}	
 }
 
-function relayout()
+function can_go_next()
 {
-	var size = find_width();
-	var adjusted_size = reduce_to_fixed_width(size);
-
-	var img = display_image(adjusted_size[0], adjusted_size[1], global_evt, global_image_list[global_image_num], "image");
-	if (can_go_next()) {
-		prepare_preload(img, adjusted_size[0], adjusted_size[1], global_evt, global_image_list[global_image_num + 1]);
-	}
-	
-	// center the image on-screen
-	var main = document.getElementById("main");
-	main.style.position = "absolute";
-	main.style.left = (size[0] - adjusted_size[0]) / 2 + "px";
-	main.style.top = (size[1] - adjusted_size[1]) / 2 + "px"; 
-	main.style.width = adjusted_size[0] + "px";
-	main.style.height = adjusted_size[1] + "px";
-	main.style.lineHeight = adjusted_size[1] + "px"; 
+	return (global_image_num < global_image_list.length - 1);
+}
 
-	set_opacity("previous", can_go_previous() ? 0.7 : 0.1);
-	set_opacity("next", can_go_next() ? 0.7 : 0.1);
-	set_opacity("close", 0.7);
+function can_go_previous()
+{
+	return (global_image_num > 0);
 }
 
 function set_opacity(id, amount)
@@ -164,54 +152,130 @@ function set_opacity(id, amount)
 	}
 }
 
-function can_go_previous()
+function relayout()
 {
-	return (global_image_num > 0);
+	var size = find_width();
+	var adjusted_size = reduce_to_fixed_width(size);
+
+	var img = display_image(adjusted_size[0], adjusted_size[1], global_image_list[global_image_num][0], global_image_list[global_image_num][1], "image");
+	if (can_go_next()) {
+		prepare_preload(img, adjusted_size[0], adjusted_size[1], global_image_list[global_image_num + 1][0], global_image_list[global_image_num + 1]);
+	}
+	
+	// center the image on-screen
+	var main = document.getElementById("main");
+	main.style.position = "absolute";
+	main.style.left = (size[0] - adjusted_size[0]) / 2 + "px";
+	main.style.top = (size[1] - adjusted_size[1]) / 2 + "px"; 
+	main.style.width = adjusted_size[0] + "px";
+	main.style.height = adjusted_size[1] + "px";
+	main.style.lineHeight = adjusted_size[1] + "px"; 
+
+	set_opacity("previous", can_go_previous() ? 0.7 : 0.1);
+	set_opacity("next", can_go_next() ? 0.7 : 0.1);
+	set_opacity("close", 0.7);
 }
 
 function go_previous()
 {
-	if (!can_go_previous())
+	if (!can_go_previous()) {
 		return;
+	}
 
 	--global_image_num;
 
 	var adjusted_size = reduce_to_fixed_width(find_width());
 
-	var img = display_image(adjusted_size[0], adjusted_size[1], global_evt, global_image_list[global_image_num], "image");
+	var img = display_image(adjusted_size[0], adjusted_size[1], global_image_list[global_image_num][0], global_image_list[global_image_num][1], "image");
 	if (can_go_previous()) {
 		set_opacity("previous", 0.7);
-		prepare_preload(img, adjusted_size[0], adjusted_size[1], global_evt, global_image_list[global_image_num - 1]);
+		prepare_preload(img, adjusted_size[0], adjusted_size[1], global_image_list[global_image_num - 1][0], global_image_list[global_image_num - 1][1]);
 	} else {
 		set_opacity("previous", 0.1);
 	}
 	set_opacity("next", can_go_next() ? 0.7 : 0.1);
 }
 
-function can_go_next()
-{
-	return (global_image_num < global_image_list.length - 1);
-}
-
 function go_next()
 {
-	if (!can_go_next())
+	if (!can_go_next()) {
 		return;
+	}
 
 	++global_image_num;
 
 	var adjusted_size = reduce_to_fixed_width(find_width());
 
-	var img = display_image(adjusted_size[0], adjusted_size[1], global_evt, global_image_list[global_image_num], "image");
+	var img = display_image(adjusted_size[0], adjusted_size[1], global_image_list[global_image_num][0], global_image_list[global_image_num][1], "image");
 	if (can_go_next()) {
 		set_opacity("next", 0.7);
-		prepare_preload(img, adjusted_size[0], adjusted_size[1], global_evt, global_image_list[global_image_num + 1]);
+		prepare_preload(img, adjusted_size[0], adjusted_size[1], global_image_list[global_image_num + 1][0], global_image_list[global_image_num + 1][1]);
 	} else {
 		set_opacity("next", 0.1);
 	}
 	set_opacity("previous", can_go_previous() ? 0.7 : 0.1);
 }
 
+function do_close()
+{
+	window.location = global_return_url;
+}
+
+function draw_text(msg)
+{
+	// remove any text we might have left
+	var text = document.getElementById("text");
+	if (text !== null) {
+		text.parentNode.removeChild(text);
+	}
+
+	text = document.createElement("p");
+	text.id = "text";
+	text.style.position = "absolute";
+	text.style.color = "white";
+	text.style.lineHeight = "24px";
+	text.style.font = "24px verdana, arial, sans-serif";
+	text.innerHTML = msg;
+
+	var main = document.getElementById("main");
+	main.appendChild(text);
+
+	text.style.left = (main.clientWidth - text.clientWidth) / 2 + "px";
+	text.style.top = (main.clientHeight - text.clientHeight) / 2 + "px";
+}
+
+function fade_text(opacity)
+{
+	set_opacity("text", opacity);
+	if (opacity > 0.0) {
+		opacity -= 0.03;
+		if (opacity < 0.0) {
+			opacity = 0.0;
+		}
+		setTimeout("fade_text(" + opacity + ")", 30);
+	} else {
+		var text = document.getElementById("text");
+		if (text !== null) {
+			text.parentNode.removeChild(text);
+		}
+	}
+}
+
+function select_image(evt, filename)
+{
+	if (!req) {
+		return;
+	}
+
+	draw_text("Selecting " + filename + "...");
+	
+	req.open("POST", "http://" + global_vhost + "/select", false);
+	req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+	req.send("mode=single&event=" + evt + "&filename=" + filename);
+
+	setTimeout("fade_text(0.99)", 30);
+}
+
 function key_down(which)
 {
 	if (which == 39) {   // right
@@ -242,68 +306,10 @@ function key_up(which) {
 		set_opacity("close", 0.7);
 		do_close();
 	} else if (which == 32 && global_select) {   // space
-		select_image(global_image_list[global_image_num]);
+		select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1]);
 	}
 }
 
-function select_image(filename)
-{
-	if (!req)
-		return;
-
-	draw_text("Selecting " + filename + "...");
-	
-	req.open("POST", "http://" + global_vhost + "/select", false);
-	req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-	req.send("mode=single&event=" + global_evt + "&filename=" + filename);
-
-	setTimeout("fade_text(0.99)", 30);
-}
-
-function fade_text(opacity)
-{
-	set_opacity("text", opacity);
-	if (opacity > 0.0) {
-		opacity -= 0.03;
-		if (opacity < 0.0)
-			opacity = 0.0;
-		setTimeout("fade_text(" + opacity + ")", 30);
-	} else {
-		var text = document.getElementById("text");
-		if (text != null) {
-			text.parentNode.removeChild(text);
-		}
-	}
-}
-
-function do_close()
-{
-	window.location = global_return_url;
-}
-
-function draw_text(msg)
-{
-	// remove any text we might have left
-	var text = document.getElementById("text");
-	if (text != null) {
-		text.parentNode.removeChild(text);
-	}
-
-	text = document.createElement("p");
-	text.id = "text";
-	text.style.position = "absolute";
-	text.style.color = "white";
-	text.style.lineHeight = "24px";
-	text.style.font = "24px verdana, arial, sans-serif";
-	text.innerHTML = msg;
-
-	var main = document.getElementById("main");
-	main.appendChild(text);
-
-	text.style.left = (main.clientWidth - text.clientWidth) / 2 + "px";
-	text.style.top = (main.clientHeight - text.clientHeight) / 2 + "px";
-}
-
 // enable the horrible horrible IE PNG hack
 function ie_png_hack()
 {