X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=files%2Fpr0n-fullscreen.js;h=c69f8a7a5830fc92f756356b7736b1db43fc34e1;hp=7e7ccf421af561cc0dd12b42b85424d4c8dcb028;hb=872fc70512d24ca88b368a9c58269a283c804192;hpb=c9ca08bc294eea3dc22474c69ec4bea8c8913907 diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js index 7e7ccf4..c69f8a7 100644 --- a/files/pr0n-fullscreen.js +++ b/files/pr0n-fullscreen.js @@ -121,7 +121,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 + "/nobox/" + filename; + var url = window.location.origin + "/" + evt + "/" + width + "x" + height + "/" + filename; var main = document.getElementById("iehack"); var preload = document.getElementById("preload"); var dpr = find_dpr(); @@ -139,20 +139,30 @@ function display_image(width, height, evt, filename, element_id) img.style.transformOrigin = "top left"; img.style.transform = "scale(" + (1.0 / dpr) + ")"; - // Infobox. - var url; - if (dpr == 1) { - url = window.location.origin + "/" + evt + "/" + width + "x" + height + "/box/" + filename; + // Update the "download original" link. + var original_url = window.location.origin + "/" + evt + "/original/" + filename; + document.getElementById("origdownload").href = original_url; + + if (global_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) + ")"; } else { - url = window.location.origin + "/" + evt + "/" + width + "x" + height + "@" + dpr.toFixed(2) + "/box/" + filename; + var boximg = document.getElementById(element_id + "_box"); + if (boximg !== null) { + boximg.parentNode.removeChild(boximg); + } } - 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; } @@ -218,35 +228,15 @@ function can_go_previous() function set_opacity(id, amount) { var elem = document.getElementById(id); - if (typeof(elem.style.opacity) != 'undefined') { // W3C - elem.style.opacity = amount; - } else if (typeof(elem.style.mozOpacity) != 'undefined') { // older Mozilla - elem.style.mozOpacity = amount; - } else if (typeof(elem.style.filter) != 'undefined') { // IE - if (elem.style.filter.indexOf("alpha") == -1) { - // add an alpha filter if there isn't one already - if (elem.style.filter) { - elem.style.filter += " "; - } else { - elem.style.filter = ""; - } - elem.style.filter += "alpha(opacity=" + (amount*100.0) + ")"; - } else { - // ugh? this seems to break in color index mode... - if (typeof(elem.filters) == 'unknown') { - elem.style.filter = "alpha(opacity=" + (amount*100.0) + ")"; - } else { - elem.filters.alpha.opacity = (amount * 100.0); - } - } - } else { // no alpha support - if (amount > 0.5) { - elem.style.visibility = "visible"; - elem.style.zorder = 1; - } else { - elem.style.visibility = "hidden"; + + // If optionmenu is visible, options is also visible. + if (id === "options" && amount < 0.7) { + var optionmenu = document.getElementById("optionmenu"); + if (optionmenu.style.display === "block") { + amount = 0.7; } } + elem.style.opacity = amount; } function center_image(num) @@ -284,9 +274,10 @@ function relayout() prepare_preload(img, global_image_num + 1); } - set_opacity("previous", can_go_previous() ? 0.7 : 0.1); - set_opacity("next", can_go_next() ? 0.7 : 0.1); - set_opacity("close", 0.7); + set_opacity("previous", can_go_previous() ? global_default_opacity : 0.1); + set_opacity("next", can_go_next() ? global_default_opacity : 0.1); + set_opacity("close", global_default_opacity); + set_opacity("options", global_default_opacity); } function go_previous() @@ -297,12 +288,12 @@ function go_previous() var img = display_image_num(--global_image_num, "image"); if (can_go_previous()) { - set_opacity("previous", 0.7); + set_opacity("previous", global_default_opacity); prepare_preload(img, global_image_num - 1); } else { set_opacity("previous", 0.1); } - set_opacity("next", can_go_next() ? 0.7 : 0.1); + set_opacity("next", can_go_next() ? global_default_opacity : 0.1); } function go_next() @@ -313,12 +304,12 @@ function go_next() var img = display_image_num(++global_image_num, "image"); if (can_go_next()) { - set_opacity("next", 0.7); + set_opacity("next", global_default_opacity); prepare_preload(img, global_image_num + 1); } else { set_opacity("next", 0.1); } - set_opacity("previous", can_go_previous() ? 0.7 : 0.1); + set_opacity("previous", can_go_previous() ? global_default_opacity : 0.1); } function do_close() @@ -326,6 +317,17 @@ function do_close() window.location = global_return_url; } +function toggle_optionmenu() +{ + var optionmenu = document.getElementById("optionmenu"); + if (optionmenu.style.display === "block") { + optionmenu.style.display = "none"; + } else { + optionmenu.style.display = "block"; + set_opacity("options", 0.7); + } +} + function draw_text(msg) { // remove any text we might have left @@ -405,16 +407,16 @@ function key_down(which) function key_up(which) { if (which == 39) { // right if (can_go_next()) { - set_opacity("next", 0.7); + set_opacity("next", global_default_opacity); go_next(); } } else if (which == 37) { // left if (can_go_previous()) { - set_opacity("previous", 0.7); + set_opacity("previous", global_default_opacity); go_previous(); } } else if (which == 27) { // escape - set_opacity("close", 0.7); + set_opacity("close", global_default_opacity); 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], 1); @@ -441,3 +443,16 @@ function check_for_hash_change() { relayout(); } } + +function toggle_immersive() { + if (global_default_opacity == 0.7) { + global_default_opacity = 0.0; + global_infobox = false; + document.getElementById('immersivetoggle').innerHTML = 'Show decorations'; + } else { + global_default_opacity = 0.7; + global_infobox = true; + document.getElementById('immersivetoggle').innerHTML = 'Hide all decorations'; + } + relayout(); +}