Make pr0n-upload.pl output a list of failed files at the end, so it's easier to do...

[pr0n] / files / pr0n-fullscreen.js

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 5434a3e30a696b9059bfe9cbf26e91594cca615b..278ad08c526c1179ed268c3ac38b51c9ed0127af 100644 (file)
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -40,15 +40,6 @@ function find_width()
        return [null,null];
 }
 
-function parse_image_num(url, default_value) {
-       var num = parseInt(window.location.hash.substr(1));
-       if (num > 1 && num <= global_image_list.length) {  // and then num != NaN
-               return (num - 1);
-       } else {
-               return default_value;
-       }
-}
-
 /*
  * pr0n can resize to any size we'd like, but we're much more likely
  * to have this set of fixed-resolution screens cached, so to increase
@@ -143,8 +134,11 @@ function display_image(width, height, evt, filename, element_id)
        var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/nobox/" + filename;
        var main = document.getElementById("iehack");
        var img = replace_image_element(url, element_id, main);
+       img.style.position = "absolute";
+       img.style.left = "0px";
+       img.style.top = "0px";
 
-       if (global_infobox != 'nobox') {
+       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);
 
@@ -176,8 +170,7 @@ function display_image_num(num, element_id)
                center_image(num);
                
                // replace the anchor part (if any) with the image number
-               var baseurl = (window.location.toString().split("#"))[0];
-               window.location = baseurl + "#" + (num+1);
+               window.location.hash = "#" + (num+1);
        }
 
        return img;
@@ -367,17 +360,21 @@ function fade_text(opacity)
        }
 }
 
-function select_image(evt, filename)
+function select_image(evt, filename, selected)
 {
        if (!req) {
                return;
        }
 
-       draw_text("Selecting " + filename + "...");
+       if (selected) {
+               draw_text("Selecting " + filename + "...");
+       } else {
+               draw_text("Unselecting " + filename + "...");
+       }
        
        req.open("POST", "http://" + global_vhost + "/select", false);
        req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-       req.send("mode=single&event=" + evt + "&filename=" + filename);
+       req.send("event=" + evt + "&filename=" + filename + "&selected=" + selected);
 
        setTimeout("fade_text(0.99)", 30);
 }
@@ -394,6 +391,8 @@ function key_down(which)
                }
        } else if (which == 27) {   // escape
                set_opacity("close", 0.99);
+       } else {
+               check_for_hash_change();
        }
 }
 
@@ -412,7 +411,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][0], global_image_list[global_image_num][1]);
+               select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1], 1);
+       } else if (which == 85 && global_select) {   // u
+               select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1], 0);
+       } else {
+               check_for_hash_change();
        }
 }
 
@@ -432,3 +435,20 @@ function ie_png_hack()
                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
+               return (num - 1);
+       } else {
+               return default_value;
+       }
+}
+
+function check_for_hash_change() {
+       var num = parse_image_num(-1);
+       if (num != -1 && num != global_image_num) {
+               global_image_num = num;
+               relayout();
+       }
+}