X-Git-Url: http://git.scottworley.com/picsort/blobdiff_plain/8bc0aad4edd7e9d033870594f833b24af6a108e1..cd368e974b63917e537306af77de71ded9f8e1ef:/picsorter.js?ds=inline

diff --git a/picsorter.js b/picsorter.js
index 2f9df0c..b1c1bdf 100644
--- a/picsorter.js
+++ b/picsorter.js
@@ -28,13 +28,19 @@ function stripFromEnd(str, suffix) {
 }
 
 function setpic() {
-  if ("exposure" in picinfo[files[input_index]]) {
-    exposure = picinfo[files[input_index]].exposure;
+  var display_filename;
+  if (endsWith(files[input_index], ".NEF")) {
+    if ("exposure" in picinfo[files[input_index]]) {
+      exposure = picinfo[files[input_index]].exposure;
+    } else {
+      picinfo[files[input_index]].exposure = exposure;
+      save_picinfo();
+    }
+    display_filename = zoom + exposure + "/" + stripFromEnd(files[input_index], ".NEF") + ".jpeg";
   } else {
-    picinfo[files[input_index]].exposure = exposure;
-    save_picinfo();
+    display_filename = zoom + files[input_index];
   }
-  $("#pic").attr("src", zoom + exposure + "/" + files[input_index]);
+  $("#pic").attr("src", display_filename);
 }
 
 function say(message) {
@@ -96,12 +102,12 @@ $(function() {
 
 Mousetrap.bind('z', toggle_zoom);
 Mousetrap.bind('Z', function() { $("#pic").toggleClass("fit_view"); });
-Mousetrap.bind('n', function() { move_to_nondeleted(1); });
-Mousetrap.bind('p', function() { move_to_nondeleted(-1); });
-Mousetrap.bind('N', function() { input_index ++; say(input_index); setpic(); });
-Mousetrap.bind('P', function() { input_index --; say(input_index); setpic(); });
-Mousetrap.bind('b', function() { change_exposure(1); });
-Mousetrap.bind('d', function() { change_exposure(-1); });
+Mousetrap.bind(['n', 'l'], function() { move_to_nondeleted(1); });
+Mousetrap.bind(['p', 'h'], function() { move_to_nondeleted(-1); });
+Mousetrap.bind(['N', 'L'], function() { input_index ++; say(input_index); setpic(); });
+Mousetrap.bind(['P', 'H'], function() { input_index --; say(input_index); setpic(); });
+Mousetrap.bind(['b', 'k'], function() { change_exposure(1); });
+Mousetrap.bind(['d', 'j'], function() { change_exposure(-1); });
 Mousetrap.bind('x', mark_deleted);
 Mousetrap.bind('X', mark_not_deleted);
 Mousetrap.bind('c', function() { $("#name").show().focus(); return false; });