move_to_nondeleted() calls setpic()

[picsort] / picsorter.js

diff --git a/picsorter.js b/picsorter.js
index 22d6f10f318e097087afe483aa2ed656a7346bce..d721ac4eeae7e93a31cbeb3ba528b2665e54dace 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -1,12 +1,17 @@
-if (!("picsorter_deleted" in localStorage)) {
-  localStorage.picsorter_deleted = JSON.stringify({});
+var picinfo = {};
+if ("picsorter_picinfo" in localStorage) {
+  picinfo = JSON.parse(localStorage.picsorter_picinfo);
 }
-var picsorter_deleted = JSON.parse(localStorage.picsorter_deleted);
+$.each(files, function(i, f) {
+  if (!(f in picinfo)) {
+    picinfo[f] = {};
+  }
+});
+localStorage.picsorter_picinfo = JSON.stringify(picinfo);
 
 var exposure = 20;
 var zoom = "sm/";
 var input_index = -1;
-move_to_nondeleted(1);
 
 
 function setpic() {
@@ -18,6 +23,11 @@ function say(message) {
   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 = "";
@@ -30,33 +40,34 @@ function toggle_zoom() {
 function move_to_nondeleted(direction) {
   do {
     input_index += direction;
-  } while (files[input_index] in picsorter_deleted);
+  } while (picinfo[files[input_index]].deleted);
   say(input_index);
+  setpic();
 }
 
 function mark_deleted() {
-  picsorter_deleted[files[input_index]] = 1;
-  localStorage.picsorter_deleted = JSON.stringify(picsorter_deleted);
+  picinfo[files[input_index]].deleted = 1;
+  localStorage.picsorter_picinfo = JSON.stringify(picinfo);
   say("Deleted");
 }
 
 function mark_not_deleted() {
-  delete picsorter_deleted[files[input_index]];
-  localStorage.picsorter_deleted = JSON.stringify(picsorter_deleted);
+  delete picinfo[files[input_index]].deleted;
+  localStorage.picsorter_picinfo = JSON.stringify(picinfo);
   say("Undeleted");
 }
 
 $(function() {
-  setpic();
+  move_to_nondeleted(1);
 });
 
 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() { 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() { exposure ++; setpic(); });
-Mousetrap.bind('d', function() { exposure --; 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);