Remove hacks for pre-IE7.

[pr0n] / files / pr0n-fullscreen.js

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index fe31090131fd1b7a546482e2219ad0a5fb59c2db..7e7ccf421af561cc0dd12b42b85424d4c8dcb028 100644 (file)
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -2,42 +2,18 @@ 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
-               return [window.innerWidth, window.innerHeight];
-       } 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()
+{
+       return window.devicePixelRatio || 1;
 }
 
 /*
@@ -145,9 +121,10 @@ 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();
        var img;
        // See if we have a preload going on that we can reuse.
        if (element_id == "image" && preload !== null && preload.src == url) {
@@ -159,15 +136,23 @@ function display_image(width, height, evt, filename, element_id)
        img.style.position = "absolute";
        img.style.left = "0px";
        img.style.top = "0px";
+       img.style.transformOrigin = "top left";
+       img.style.transform = "scale(" + (1.0 / dpr) + ")";
 
-       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";
+       // 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;
 }
@@ -267,6 +252,7 @@ function set_opacity(id, amount)
 function center_image(num)
 {
        var screen_size = find_width();
+       var dpr = find_dpr();
        var width, height;
        
        if (global_image_list[num][2] == -1) {
@@ -284,11 +270,11 @@ function center_image(num)
        // center the image on-screen
        var main = document.getElementById("main");
        main.style.position = "absolute";
-       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";
+       main.style.left = (((screen_size[0] - width) / 2) / dpr) + "px";
+       main.style.top = (((screen_size[1] - height) / 2) / dpr) + "px";
+       main.style.width = (width / dpr) + "px";
+       main.style.height = (height / dpr) + "px";
+       main.style.lineHeight = (height / dpr) + "px";
 }
 
 function relayout()
@@ -392,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);
 
@@ -439,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