Bind keys directly where possible

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index c3af639441e865b47560208c5a605e0bb7437cc2..1d42b018b2eafc9e981af3e9d2f4d5abb539d5ff 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -1,10 +1,13 @@
-var exposure = 20;
-var input_index = 0;
-var zoom = "sm/";
-
 if (!("picsorter_deleted" in localStorage)) {
   localStorage.picsorter_deleted = JSON.stringify({});
 }
+var picsorter_deleted = JSON.parse(localStorage.picsorter_deleted);
+
+var exposure = 20;
+var zoom = "sm/";
+var input_index = -1;
+move_to_nondeleted(1);
+
 
 function setpic() {
   $("#pic").attr("src", zoom + exposure + "/" + files[input_index]);
@@ -16,32 +19,30 @@ function toggle_zoom() {
   } else {
     zoom = "sm/";
   }
+  setpic();
 }
 
 function move_to_nondeleted(direction) {
-  var deleted = JSON.parse(localStorage.picsorter_deleted);
   do {
     input_index += direction;
-  } while (files[input_index] in deleted);
+  } while (files[input_index] in picsorter_deleted);
 }
 
 function mark_deleted() {
-  var deleted = JSON.parse(localStorage.picsorter_deleted);
-  deleted[files[input_index]] = 1;
-  localStorage.picsorter_deleted = JSON.stringify(deleted);
+  picsorter_deleted[files[input_index]] = 1;
+  localStorage.picsorter_deleted = JSON.stringify(picsorter_deleted);
 }
 
 function mark_not_deleted() {
-  var deleted = JSON.parse(localStorage.picsorter_deleted);
-  delete deleted[files[input_index]];
-  localStorage.picsorter_deleted = JSON.stringify(deleted);
+  delete picsorter_deleted[files[input_index]];
+  localStorage.picsorter_deleted = JSON.stringify(picsorter_deleted);
 }
 
 $(function() {
   setpic();
 });
 
-Mousetrap.bind('z', function() { toggle_zoom(); setpic(); });
+Mousetrap.bind('z', toggle_zoom);
 Mousetrap.bind('Z', function() { $("#pic").toggleClass("fit_view"); });
 Mousetrap.bind('n', function() { move_to_nondeleted(1); setpic(); });
 Mousetrap.bind('p', function() { move_to_nondeleted(-1); setpic(); });
@@ -49,5 +50,5 @@ Mousetrap.bind('N', function() { input_index ++; setpic(); });
 Mousetrap.bind('P', function() { input_index --; setpic(); });
 Mousetrap.bind('b', function() { exposure ++; setpic(); });
 Mousetrap.bind('d', function() { exposure --; setpic(); });
-Mousetrap.bind('x', function() { mark_deleted(); });
-Mousetrap.bind('X', function() { mark_not_deleted(); });
+Mousetrap.bind('x', mark_deleted);
+Mousetrap.bind('X', mark_not_deleted);