Unbroke infobox=0 for fullscreen mode.

[pr0n] / files / pr0n-fullscreen.js

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 95829951dfc8f0cd530b58ef102c76d95fba32f1..2a43c07ee0d2332922e776e08a0aa1c6dd0eb7d8 100644 (file)
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -40,20 +40,6 @@ function find_width()
        return [null,null];
 }
 
-function parse_image_num(url, default_value) {
-       var url_array = (window.location.toString().split("#"));
-       if (url_array.length != 2) {
-               return default_value;
-       }
-
-       var num = parseInt(url_array[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
@@ -64,9 +50,12 @@ function parse_image_num(url, default_value) {
  * pick_image_size, below.
  */
 var fixed_sizes = [
+       [ 2048, 1536 ],
+       [ 1920, 1440 ],
        [ 1600, 1200 ],
        [ 1400, 1050 ],
        [ 1280, 960 ],
+       [ 1152, 864 ],
        [ 1024, 768 ],
        [ 800, 600 ],
        [ 640, 480 ],
@@ -120,9 +109,8 @@ function pick_image_size(screen_size, image_size)
        return [ 80, 64 ];
 }
 
-function display_image(width, height, evt, filename, element_id)
+function replace_image_element(url, element_id, parent_node)
 {
-       var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/" + global_infobox + filename;
        var img = document.getElementById(element_id);
        if (img !== null) {
                img.src = "data:";
@@ -137,8 +125,24 @@ function display_image(width, height, evt, filename, element_id)
                img.src = url;
        }
        
+       parent_node.appendChild(img);
+       return img;
+}
+
+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");
-       main.appendChild(img);
+       var img = replace_image_element(url, element_id, main);
+
+       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";
+       }
 
        return img;
 }
@@ -163,8 +167,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;
@@ -178,6 +181,12 @@ function prepare_preload(img, num)
                preload.src = "data:";
                preload.parentNode.removeChild(preload);
        }
+       
+       var preload_box = document.getElementById("preload_box");
+       if (preload_box !== null) {
+               preload_box.src = "data:";
+               preload_box.parentNode.removeChild(preload_box);
+       }
 
        // grmf -- IE doesn't fire onload if the image was loaded from cache, so check for
        // completeness first; should at least be _somewhat_ better
@@ -375,6 +384,8 @@ function key_down(which)
                }
        } else if (which == 27) {   // escape
                set_opacity("close", 0.99);
+       } else {
+               check_for_hash_change();
        }
 }
 
@@ -394,6 +405,8 @@ function key_up(which) {
                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]);
+       } else {
+               check_for_hash_change();
        }
 }
 
@@ -413,3 +426,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();
+       }
+}