X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=files%2Fpr0n-fullscreen.js;h=d66a5f1e849ba26c9974f134e4909bfc80035d4c;hp=293f9a0d63343add4bd414046a210673175675d2;hb=e2a371c2ca30d21795053333a8d539477abeee81;hpb=1f18555fdef25867cd7e2bedfc6d4ceaeddaa1ca

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 293f9a0..d66a5f1 100644
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -26,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 ],
@@ -139,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;
@@ -331,6 +348,7 @@ function toggle_optionmenu()
 		set_opacity("options", 0.7);
 	}
 }
+window['toggle_optionmenu'] = toggle_optionmenu;
 
 function draw_text(msg)
 {
@@ -363,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) {
@@ -385,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)
@@ -462,6 +480,7 @@ function toggle_immersive() {
 	}
 	relayout();
 }
+window['toggle_immersive'] = toggle_immersive;
 
 window.onload = function() {
 	relayout();
@@ -469,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(); };