Remove an old IE hack.

[pr0n] / files / pr0n-fullscreen.js

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 1557881f733a5ee260349520e19a4bd506ecd501..49d20bd577968f0af1ee63c0b2c81e5d2438974a 100644 (file)
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -1,3 +1,10 @@
+(function() {
+
+var global_disabled_opacity = 0.1;
+var global_default_opacity = 0.7;
+var global_highlight_opacity = 1.0;
+var global_infobox = true;
+
 function find_width()
 {
        var dpr = find_dpr();
@@ -19,6 +26,9 @@ function find_dpr()
  * pick_image_size, below.
  */
 var fixed_sizes = [
+       [ 3840, 2880 ],
+       [ 3200, 2400 ],
+       [ 2800, 2100 ],
        [ 2304, 1728 ],
        [ 2048, 1536 ],
        [ 1920, 1440 ],
@@ -115,7 +125,7 @@ function rename_element(old_name, new_name)
 function display_image(width, height, evt, filename, element_id)
 {
        var url = window.location.origin + "/" + evt + "/" + width + "x" + height + "/" + filename;
-       var main = document.getElementById("iehack");
+       var main = document.getElementById("main");
        var preload = document.getElementById("preload");
        var dpr = find_dpr();
        var img;
@@ -132,9 +142,23 @@ function display_image(width, height, evt, filename, element_id)
        img.style.transformOrigin = "top left";
        img.style.transform = "scale(" + (1.0 / dpr) + ")";
 
-       // Update the "download original" link.
-       var original_url = window.location.origin + "/" + evt + "/original/" + filename;
-       document.getElementById("origdownload").href = original_url;
+       if (element_id == "image") {
+               // Update the "download original" link.
+               var original_url = window.location.origin + "/" + evt + "/original/" + filename;
+               document.getElementById("origdownload").href = original_url;
+
+               // If it's a raw image, show a JPEG link.
+               var fulldownload = document.getElementById("fulldownload");
+               if (filename.match(/\.(nef|cr2)$/i)) {
+                       fulldownload.style.display = "block";
+                       var full_url = window.location.origin + "/" + evt + "/" + filename;
+                       document.getElementById("fulldownloadlink").href = full_url;
+                       origdownload.innerHTML = "Download original image (RAW)";
+               } else {
+                       fulldownload.style.display = "none";
+                       origdownload.innerHTML = "Download original image";
+               }
+       }
 
        if (global_infobox) {
                var url;
@@ -324,6 +348,7 @@ function toggle_optionmenu()
                set_opacity("options", 0.7);
        }
 }
+window['toggle_optionmenu'] = toggle_optionmenu;
 
 function draw_text(msg)
 {
@@ -356,7 +381,7 @@ function fade_text(opacity)
                if (opacity < 0.0) {
                        opacity = 0.0;
                }
-               setTimeout("fade_text(" + opacity + ")", 30);
+               setTimeout(function() { fade_text(opacity); }, 30);
        } else {
                var text = document.getElementById("text");
                if (text !== null) {
@@ -378,7 +403,7 @@ function select_image(evt, filename, selected)
        req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
        req.send("event=" + evt + "&filename=" + filename + "&selected=" + selected);
 
-       setTimeout("fade_text(0.99)", 30);
+       setTimeout(function() { fade_text(0.99); }, 30);
 }
 
 function key_down(which)
@@ -429,6 +454,7 @@ function parse_image_num(default_value) {
                return default_value;
        }
 }
+window['parse_image_num'] = parse_image_num;
 
 function check_for_hash_change() {
        var num = parse_image_num(-1);
@@ -454,6 +480,7 @@ function toggle_immersive() {
        }
        relayout();
 }
+window['toggle_immersive'] = toggle_immersive;
 
 window.onload = function() {
        relayout();
@@ -461,8 +488,8 @@ window.onload = function() {
 
        var body = document.body;
        body.onresize = function() { relayout(); };
-       body.onkeydown = function() { key_down(event.keyCode); };
-       body.onkeyup = function() { key_up(event.keyCode); };
+       body.onkeydown = function(evt) { key_down(evt.keyCode); };
+       body.onkeyup = function(evt) { key_up(evt.keyCode); };
        body.onhashchange = function() { check_for_hash_change(); };
        body.onclick = function() { check_for_hash_change(); };
 
@@ -486,3 +513,5 @@ window.onload = function() {
        options.onmouseup = function() { set_opacity('options', global_default_opacity); toggle_optionmenu(); };
        options.onmouseout = function() { set_opacity('options', global_default_opacity); };
 };
+
+})();