X-Git-Url: http://git.scottworley.com/picsort/blobdiff_plain/2d325f41181d0bf021f09fec06c95d49ff123e8c..ca26d0d738c3eaa798f3fd53e75756910328fc37:/picsorter.js?ds=inline

diff --git a/picsorter.js b/picsorter.js
index c3af639..d3f50cc 100644
--- a/picsorter.js
+++ b/picsorter.js
@@ -1,53 +1,67 @@
-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]);
 }
 
+function say(message) {
+  $("#message").text(message).removeClass("fade");
+  setTimeout(function() { $("#message").addClass("fade"); }, 1);
+}
+
+function say_exposure() {
+  var e = (exposure / 4) - 3.5;
+  say((e >= 0 ? "+" : "") + e);
+}
+
 function toggle_zoom() {
   if (zoom) {
     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);
+  say(input_index);
 }
 
 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);
+  say("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);
+  say("Undeleted");
 }
 
 $(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(); });
-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('N', function() { input_index ++; say(input_index); setpic(); });
+Mousetrap.bind('P', function() { input_index --; say(input_index); setpic(); });
+Mousetrap.bind('b', function() { exposure ++; say_exposure(); setpic(); });
+Mousetrap.bind('d', function() { exposure --; say_exposure(); setpic(); });
+Mousetrap.bind('x', mark_deleted);
+Mousetrap.bind('X', mark_not_deleted);