X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=files%2Fpr0n-fullscreen.js;h=95829951dfc8f0cd530b58ef102c76d95fba32f1;hp=37fd67367cf1034c53ca9b58519745b0594b06c2;hb=0f41d1a8beed02aacf3e08cc963ccc0a765427f7;hpb=a58f1ab4dd5b224b12ed78096b6867f47c316231

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 37fd673..9582995 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
@@ -99,12 +113,13 @@ function pick_image_size(screen_size, image_size)
 		}
 
 		if (screen_size[0] >= width && screen_size[1] >= height) {
-			return fixed_sizes[i];
+			// be sure _not_ to return a reference
+			return [ fixed_sizes[i][0], fixed_sizes[i][1], width, height ];
 		}
 	}
 	return [ 80, 64 ];
 }
-	
+
 function display_image(width, height, evt, filename, element_id)
 {
 	var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/" + global_infobox + filename;
@@ -141,9 +156,17 @@ function display_image_num(num, element_id)
 	}
 
 	var img = display_image(adjusted_size[0], adjusted_size[1], global_image_list[num][0], global_image_list[num][1], element_id);
+	
 	if (element_id == "image") {
+		// we want to shrink the box as much as possible if we know the true
+		// size of the image
 		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);
 	}
+
 	return img;
 }
 
@@ -212,24 +235,28 @@ function set_opacity(id, amount)
 function center_image(num)
 {
 	var screen_size = find_width();
-	var adjusted_size;
+	var width, height;
 	
 	if (global_image_list[num][2] == -1) {
 		// no size information, use our pessimal guess
-		adjusted_size = max_image_size(screen_size);
+		var adjusted_size = max_image_size(screen_size);
+		width = adjusted_size[0];
+		height = adjusted_size[1];
 	} else {
-		adjusted_size = pick_image_size(screen_size, [ global_image_list[num][2], global_image_list[num][3] ]);
+		// use the exact information
+		var adjusted_size = pick_image_size(screen_size, [ global_image_list[num][2], global_image_list[num][3] ]);
+		width = adjusted_size[2];
+		height = adjusted_size[3];
 	}
 
 	// center the image on-screen
 	var main = document.getElementById("main");
 	main.style.position = "absolute";
-	main.style.left = (screen_size[0] - adjusted_size[0]) / 2 + "px";
-	main.style.top = (screen_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"; 
-
+	main.style.left = (screen_size[0] - width) / 2 + "px";
+	main.style.top = (screen_size[1] - height) / 2 + "px"; 
+	main.style.width = width + "px";
+	main.style.height = height + "px";
+	main.style.lineHeight = height + "px";
 }
 
 function relayout()
@@ -238,8 +265,6 @@ function relayout()
 	if (can_go_next()) {
 		prepare_preload(img, global_image_num + 1);
 	}
-	
-	center_image(global_image_num);
 
 	set_opacity("previous", can_go_previous() ? 0.7 : 0.1);
 	set_opacity("next", can_go_next() ? 0.7 : 0.1);