X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=files%2Fpr0n-fullscreen.js;h=7e7ccf421af561cc0dd12b42b85424d4c8dcb028;hb=c9ca08bc294eea3dc22474c69ec4bea8c8913907;hp=8c02b45e13cad0a442f5442aae1c50d38b6148f8;hpb=e78f88f249607b1367c7cbe38c564e93ad52f30e;p=pr0n
diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 8c02b45..7e7ccf4 100644
--- 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;
}
/*
@@ -50,6 +26,7 @@ function find_width()
* pick_image_size, below.
*/
var fixed_sizes = [
+ [ 2304, 1728 ],
[ 2048, 1536 ],
[ 1920, 1440 ],
[ 1600, 1200 ],
@@ -144,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) {
@@ -158,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;
}
@@ -266,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) {
@@ -283,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()
@@ -391,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);
@@ -438,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 = "";
-
- var previous = document.getElementById("previous");
- previous.outerHTML = "";
-
- var close = document.getElementById("close");
- close.outerHTML = "";
- }
-}
-
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