X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=files%2Fpr0n-fullscreen.js;h=7e7ccf421af561cc0dd12b42b85424d4c8dcb028;hp=789cda741f5c15ab6f4c88e31dba5489ff0025a5;hb=c9ca08bc294eea3dc22474c69ec4bea8c8913907;hpb=bf395f582ddf4acd911cdeecca86b24fbc0e833f

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 789cda7..7e7ccf4 100644
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -2,43 +2,13 @@ var req;
 
 function init_ajax()
 {
-	req = false;
-
-	if (window.XMLHttpRequest) {
-		// Mozilla/Safari
-		try {
-			req = new XMLHttpRequest();
-		} catch(e) {
-			req = false;
-		}
-	} else if (window.ActiveXObject) {
-		// IE/Windows
-		try {
-			req = new ActiveXObject("Msxml2.XMLHTTP");
-		} catch(e) {
-			try {
-				req = new ActiveXObject("Microsoft.XMLHTTP");
-			} catch(e) {
-				req = false;
-			}
-		}
-	}
+	req = new XMLHttpRequest();
 }
 
 function find_width()
 {
-	if (typeof(window.innerWidth) == 'number') {
-		// non-IE
-		var dpr = find_dpr();
-		return [window.innerWidth * dpr, window.innerHeight * dpr];
-	} else if (document.documentElement && (document.documentElement.clientWidth || document.documentElement.clientHeight)) {
-		// IE 6+ in 'standards compliant mode'
-		return [document.documentElement.clientWidth, document.documentElement.clientHeight];
-	} else if (document.body && (document.body.clientWidth || document.body.clientHeight)) {
-		// IE 4-compatible
-		return [document.body.clientWidth, document.body.clientHeight];
-	}
-	return [null,null];
+	var dpr = find_dpr();
+	return [window.innerWidth * dpr, window.innerHeight * dpr];
 }
 
 function find_dpr()
@@ -151,7 +121,7 @@ function rename_element(old_name, new_name)
 
 function display_image(width, height, evt, filename, element_id)
 {
-	var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/nobox/" + filename;
+	var url = window.location.origin + "/" + evt + "/" + width + "x" + height + "/nobox/" + filename;
 	var main = document.getElementById("iehack");
 	var preload = document.getElementById("preload");
 	var dpr = find_dpr();
@@ -169,21 +139,20 @@ function display_image(width, height, evt, filename, element_id)
 	img.style.transformOrigin = "top left";
 	img.style.transform = "scale(" + (1.0 / dpr) + ")";
 
-	if (global_infobox != 'nobox/') {
-		var url;
-		if (dpr == 1) {
-			url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/box/" + filename;
-		} else {
-			url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "@" + dpr.toFixed(2) + "/box/" + filename;
-		}
-		var boximg = replace_image_element(url, element_id + "_box", main);
-
-		boximg.style.position = "absolute";
-		boximg.style.left = "0px";
-		boximg.style.bottom = "-1px";
-		boximg.style.transformOrigin = "bottom left";
-		boximg.style.transform = "scale(" + (1.0 / dpr) + ")";
+	// Infobox.
+	var url;
+	if (dpr == 1) {
+		url = window.location.origin + "/" + evt + "/" + width + "x" + height + "/box/" + filename;
+	} else {
+		url = window.location.origin + "/" + evt + "/" + width + "x" + height + "@" + dpr.toFixed(2) + "/box/" + filename;
 	}
+	var boximg = replace_image_element(url, element_id + "_box", main);
+
+	boximg.style.position = "absolute";
+	boximg.style.left = "0px";
+	boximg.style.bottom = "-1px";
+	boximg.style.transformOrigin = "bottom left";
+	boximg.style.transform = "scale(" + (1.0 / dpr) + ")";
 
 	return img;
 }
@@ -409,7 +378,7 @@ function select_image(evt, filename, selected)
 		draw_text("Unselecting " + filename + "...");
 	}
 	
-	req.open("POST", "http://" + global_vhost + "/select", false);
+	req.open("POST", window.location.origin + "/select", false);
 	req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
 	req.send("event=" + evt + "&filename=" + filename + "&selected=" + selected);
 
@@ -456,23 +425,6 @@ function key_up(which) {
 	}
 }
 
-// enable the horrible horrible IE PNG hack
-function ie_png_hack()
-{
-	var vstr = navigator.appVersion.split("MSIE");
-	var v = parseFloat(vstr[1]);
-	if (v >= 5.5 && v < 7.0 && document.body.filters) {
-		var next = document.getElementById("next");
-		next.outerHTML = "<span id=\"next\" style=\"display: inline-block; position: absolute; bottom: 0px; right: 0px; width: 50px; height: 50px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + next.src + "')\" onmousedown=\"if (can_go_next()) set_opacity('next', 1.0)\" onmouseup=\"if (can_go_next()) { set_opacity('next', 0.7); go_next(); }\" onmouseout=\"if (can_go_next()) { set_opacity('next', 0.7); }\" />";
-		
-		var previous = document.getElementById("previous");
-		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=\"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