X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=files%2Fpr0n-fullscreen.js;h=1d82ebc3280e05631a01c4ee62488479cf689e89;hb=afc8b978848ea38664a77e2d9cc37d3271cb0937;hp=efacecc4364aec3c78b4a233a8ba2907f9ed174c;hpb=d98f904f68497ff0ad0eaf6bcbf19b07b25ffd57;p=pr0n

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index efacecc..1d82ebc 100644
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -40,6 +40,20 @@ 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
@@ -50,9 +64,12 @@ function find_width()
  * pick_image_size, below.
  */
 var fixed_sizes = [
+	[ 2048, 1536 ],
+	[ 1920, 1440 ],
 	[ 1600, 1200 ],
 	[ 1400, 1050 ],
 	[ 1280, 960 ],
+	[ 1152, 864 ],
 	[ 1024, 768 ],
 	[ 800, 600 ],
 	[ 640, 480 ],
@@ -106,9 +123,8 @@ function pick_image_size(screen_size, image_size)
 	return [ 80, 64 ];
 }
 
-function display_image(width, height, evt, filename, element_id)
+function replace_image_element(url, element_id, parent_node)
 {
-	var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/" + global_infobox + filename;
 	var img = document.getElementById(element_id);
 	if (img !== null) {
 		img.src = "data:";
@@ -123,8 +139,24 @@ function display_image(width, height, evt, filename, element_id)
 		img.src = url;
 	}
 	
+	parent_node.appendChild(img);
+	return img;
+}
+
+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");
-	main.appendChild(img);
+	var img = replace_image_element(url, element_id, main);
+
+	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);
+
+		boximg.style.position = "absolute";
+		boximg.style.left = "0px";
+		boximg.style.bottom = "-1px";
+	}
 
 	return img;
 }
@@ -148,9 +180,9 @@ function display_image_num(num, element_id)
 		// size of the image
 		center_image(num);
 		
-		document.getElementById('linkbg1').href = global_bookmark_url_base + (num+1);
-		document.getElementById('linkbg2').href = global_bookmark_url_base + (num+1);
-		document.getElementById('linkbg3').href = global_bookmark_url_base + (num+1);
+		// replace the anchor part (if any) with the image number
+		var baseurl = (window.location.toString().split("#"))[0];
+		window.location = baseurl + "#" + (num+1);
 	}
 
 	return img;
@@ -164,6 +196,12 @@ function prepare_preload(img, num)
 		preload.src = "data:";
 		preload.parentNode.removeChild(preload);
 	}
+	
+	var preload_box = document.getElementById("preload_box");
+	if (preload_box !== null) {
+		preload_box.src = "data:";
+		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