X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=files%2Fpr0n-fullscreen.js;h=fe31090131fd1b7a546482e2219ad0a5fb59c2db;hp=bbc287a2f94d75b0a90eabf487896d5d34252175;hb=060aaacf0d15a03ed7287cf81169f630a1a1f95b;hpb=e0d3b74068825a65a64513660cc53a403815403d;ds=sidebyside

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index bbc287a..fe31090 100644
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -40,20 +40,6 @@ function find_width()
 	return [null,null];
 }
 
-function parse_image_num(url, default_value) {
-	var url_array = (window.location.toString().split("#"));
-	if (url_array.length != 2) {
-		return default_value;
-	}
-
-	var num = parseInt(url_array[1]);
-	if (num > 1 && num <= global_image_list.length) {  // and then num != NaN
-		return (num - 1);
-	} else {
-		return default_value;
-	}
-}
-
 /*
  * pr0n can resize to any size we'd like, but we're much more likely
  * to have this set of fixed-resolution screens cached, so to increase
@@ -64,6 +50,9 @@ function parse_image_num(url, default_value) {
  * pick_image_size, below.
  */
 var fixed_sizes = [
+	[ 2304, 1728 ],
+	[ 2048, 1536 ],
+	[ 1920, 1440 ],
 	[ 1600, 1200 ],
 	[ 1400, 1050 ],
 	[ 1280, 960 ],
@@ -125,29 +114,53 @@ function replace_image_element(url, element_id, parent_node)
 {
 	var img = document.getElementById(element_id);
 	if (img !== null) {
-		img.src = "data:";
+		if (img.src === url) {
+			return img;
+		}
 		img.parentNode.removeChild(img);
 	}
 
 	img = document.createElement("img");
 	img.id = element_id;
 	img.alt = "";
-
-	if (img.src != url) {
-		img.src = url;
-	}
-	
+	img.src = url;
 	parent_node.appendChild(img);
 	return img;
 }
 
+function rename_element(old_name, new_name)
+{
+	// Remove any element that's in the way.
+	var elem = document.getElementById(new_name);
+	if (elem !== null) {
+		elem.parentNode.removeChild(elem);
+	}
+
+	elem = document.getElementById(old_name);
+	if (elem !== null) {
+		elem.id = new_name;
+	}
+	return elem;
+}
+
 function display_image(width, height, evt, filename, element_id)
 {
 	var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/nobox/" + filename;
 	var main = document.getElementById("iehack");
-	var img = replace_image_element(url, element_id, main);
+	var preload = document.getElementById("preload");
+	var img;
+	// See if we have a preload going on that we can reuse.
+	if (element_id == "image" && preload !== null && preload.src == url) {
+		rename_element("preload_box", "image_box");
+		img = rename_element("preload", "image");
+	} else {
+		img = replace_image_element(url, element_id, main);
+	}
+	img.style.position = "absolute";
+	img.style.left = "0px";
+	img.style.top = "0px";
 
-	if (global_infobox != 'nobox') {
+	if (global_infobox != 'nobox/') {
 		var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/box/" + filename;
 		var boximg = replace_image_element(url, element_id + "_box", main);
 
@@ -179,8 +192,7 @@ function display_image_num(num, element_id)
 		center_image(num);
 		
 		// replace the anchor part (if any) with the image number
-		var baseurl = (window.location.toString().split("#"))[0];
-		window.location = baseurl + "#" + (num+1);
+		window.location.hash = "#" + (num+1);
 	}
 
 	return img;
@@ -191,9 +203,13 @@ function prepare_preload(img, num)
 	// cancel any pending preload
 	var preload = document.getElementById("preload");
 	if (preload !== null) {
-		preload.src = "data:";
 		preload.parentNode.removeChild(preload);
 	}
+	
+	var preload_box = document.getElementById("preload_box");
+	if (preload_box !== null) {
+		preload_box.parentNode.removeChild(preload_box);
+	}
 
 	// grmf -- IE doesn't fire onload if the image was loaded from cache, so check for
 	// completeness first; should at least be _somewhat_ better
@@ -364,17 +380,21 @@ function fade_text(opacity)
 	}
 }
 
-function select_image(evt, filename)
+function select_image(evt, filename, selected)
 {
 	if (!req) {
 		return;
 	}
 
-	draw_text("Selecting " + filename + "...");
+	if (selected) {
+		draw_text("Selecting " + filename + "...");
+	} else {
+		draw_text("Unselecting " + 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);
+	req.send("event=" + evt + "&filename=" + filename + "&selected=" + selected);
 
 	setTimeout("fade_text(0.99)", 30);
 }
@@ -391,6 +411,8 @@ function key_down(which)
 		}
 	} else if (which == 27) {   // escape
 		set_opacity("close", 0.99);
+	} else {
+		check_for_hash_change();
 	}
 }
 
@@ -409,7 +431,11 @@ 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][0], global_image_list[global_image_num][1]);
+		select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1], 1);
+	} else if (which == 85 && global_select) {   // u
+		select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1], 0);
+	} else {
+		check_for_hash_change();
 	}
 }
 
@@ -429,3 +455,20 @@ function ie_png_hack()
 		close.outerHTML = "<span id=\"close\" style=\"display: inline-block; position: absolute; top: 0px; right: 0px; width: 50px; height: 50px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + close.src + "')\" onmousedown=\"set_opacity('close', 1.0)\" onmouseup=\"set_opacity('close', 0.7); do_close();\" onmouseout=\"set_opacity('close', 0.7);\" />";
 	}
 }
+
+function parse_image_num(default_value) {
+	var num = parseInt(window.location.hash.substr(1));
+	if (num >= 1 && num <= global_image_list.length) {  // and then num != NaN
+		return (num - 1);
+	} else {
+		return default_value;
+	}
+}
+
+function check_for_hash_change() {
+	var num = parse_image_num(-1);
+	if (num != -1 && num != global_image_num) {
+		global_image_num = num;
+		relayout();
+	}
+}