Fix centering of text again.

[pr0n] / files / pr0n-fullscreen.js

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 86e73a731fafd77fc38bc81c296a5c4e60b06cf5..d9d37c6131b8226a952e95677f2991d9e404f2d2 100644 (file)
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -381,11 +381,11 @@ function draw_text(msg)
        text.style.font = "24px verdana, arial, sans-serif";
        text.innerHTML = msg;
 
-       var main = document.getElementById("main");
-       main.appendChild(text);
+       document.getElementById("main").appendChild(text);
 
-       text.style.left = (main.clientWidth - text.clientWidth) / 2 + "px";
-       text.style.top = (main.clientHeight - text.clientHeight) / 2 + "px";
+       var screen_size = find_width();
+       text.style.left = (screen_size[0] - text.clientWidth) / 2 + "px";
+       text.style.top = (screen_size[1] - text.clientHeight) / 2 + "px";
 }
 
 function fade_text(opacity)
@@ -414,7 +414,7 @@ function select_image(evt, filename, selected)
        }
        
        var req = new XMLHttpRequest();
-       req.open("POST", window.location.origin + "/select", false);
+       req.open("POST", window.location.origin + "/select", true);
        req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
        req.send("event=" + evt + "&filename=" + filename + "&selected=" + selected);
 
@@ -504,6 +504,12 @@ function set_swipe_pos(x, transition)
 {
        x = Math.max(x, -window.innerWidth);
        x = Math.min(x,  window.innerWidth);
+       if (!can_go_previous()) {
+               x = Math.min(x, window.innerWidth / 8);
+       }
+       if (!can_go_next()) {
+               x = Math.max(x, -window.innerWidth / 8);
+       }
 
        var dpr = find_dpr();
        var main = document.getElementById("main");
@@ -535,10 +541,10 @@ function end_swipe(e)
 {
        if (swiping) {
                var new_x = (e.changedTouches[0].pageX - swipe_start_x);
-               if (new_x < -window.innerWidth / 4) {
+               if (new_x < -window.innerWidth / 4 && can_go_next()) {
                        set_swipe_pos(-window.innerWidth, "transform 0.1s ease-out");
                        setTimeout(function() { go_next(); }, 100);
-               } else if (new_x > window.innerWidth / 4) {
+               } else if (new_x > window.innerWidth / 4 && can_go_previous()) {
                        set_swipe_pos(window.innerWidth, "transform 0.1s ease-out");
                        setTimeout(function() { go_previous(); }, 100);
                } else {
@@ -554,7 +560,6 @@ function swipe(e)
                var new_x = (e.changedTouches[0].pageX - swipe_start_x);
                set_swipe_pos(new_x, null);
        }
-       e.preventDefault();
 }
 
 window.onload = function() {