X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=files%2Fpr0n-fullscreen.js;h=001efc1c5e60d9f995546c3e7eccf907ad94a320;hp=39b3495e68c8df5db89f25051dab53d4185c9319;hb=0be330a853e0a38122851ced78578d8b03205e27;hpb=1408bde4764a0004702d92d106547f69f4d0c2be

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 39b3495..001efc1 100644
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -67,10 +67,10 @@ function reduce_to_fixed_width(size)
 	
 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) {
-		img.src = "";
+		img.src = "data:";
 		img.parentNode.removeChild(img);
 	}
 
@@ -82,7 +82,7 @@ function display_image(width, height, evt, filename, element_id)
 		img.src = url;
 	}
 	
-	var main = document.getElementById("main");
+	var main = document.getElementById("iehack");
 	main.appendChild(img);
 
 	return img;
@@ -93,15 +93,17 @@ function prepare_preload(img, width, height, evt, filename)
 	// cancel any pending preload
 	var preload = document.getElementById("preload");
 	if (preload != null) {
-		preload.src = "";
+		preload.src = "data:";
 		preload.parentNode.removeChild(preload);
 	}
-		
-	if (document.all) {  // IE-specific
-		img.onload = "display_image(" + width + "," + height + ",\"" + evt + "\",\"" + filename + "\",\"preload\");";
+
+	// grmf -- IE doesn't fire onload if the image was loaded from cache, so check for
+	// completeness first; should at least be _somewhat_ better
+	if (img.complete) {
+		display_image(width, height, evt, filename, "preload");
 	} else {
-		img.onload = function() { display_image(width, height, evt, filename, "preload"); }
-	}
+		img.onload = function() { display_image(width, height, evt, filename, "preload"); };
+	}	
 }
 
 function relayout()
@@ -109,9 +111,9 @@ function relayout()
 	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");
+	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_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]);
 	}
 	
 	// center the image on-screen
@@ -144,8 +146,13 @@ function set_opacity(id, amount)
 				elem.style.filter = "";
 			}
 			elem.style.filter += "alpha(opacity=" + (amount*100.0) + ")";
-		} else {
-			elem.filters.alpha.opacity = (amount * 100.0);
+		} else {	
+			// ugh? this seems to break in color index mode...
+			if (typeof(elem.filters) == 'unknown') {
+				elem.style.filter = "alpha(opacity=" + (amount*100.0) + ")";
+			} else {
+				elem.filters.alpha.opacity = (amount * 100.0);
+			}
 		}
 	} else {                             // no alpha support
 		if (amount > 0.5) {
@@ -171,10 +178,10 @@ function go_previous()
 
 	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);
 	}
@@ -195,10 +202,10 @@ function go_next()
 
 	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);
 	}
@@ -235,11 +242,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]);
+		select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1]);
 	}
 }
 
-function select_image(filename)
+function select_image(evt, filename)
 {
 	if (!req)
 		return;
@@ -248,7 +255,7 @@ function select_image(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);
+	req.send("mode=single&event=" + evt + "&filename=" + filename);
 
 	setTimeout("fade_text(0.99)", 30);
 }
@@ -310,6 +317,6 @@ function ie_png_hack()
 		previous.outerHTML = "<span id=\"previous\" style=\"display: inline-block; position: absolute; bottom: 0px; right: 0px; width: 50px; height: 50px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + previous.src + "')\" onmousedown=\"if (can_go_previous()) set_opacity('previous', 1.0)\" onmouseup=\"if (can_go_previous()) { set_opacity('previous', 0.7); go_previous(); }\" onmouseout=\"if (can_go_previous()) { set_opacity('previous', 0.7); }\" />";
 		
 		var close = document.getElementById("close");
-		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=\"if (can_go_close()) set_opacity('close', 1.0)\" onmouseup=\"if (can_go_close()) { set_opacity('close', 0.7); go_close(); }\" onmouseout=\"if (can_go_close()) { set_opacity('close', 0.7); }\" />";
+		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);\" />";
 	}
 }