Generalize mark_deleted

For multiple flavors of delete

diff --git a/picsorter.js b/picsorter.js
index cfbf5db7f4754bd16824a1fc0ceb548a331434cb..4f04c056f124dce00d34a393c2f205d7ba0b434b 100644 (file)
--- a/picsorter.js
+++ b/picsorter.js
@@ -108,10 +108,10 @@ function move_to_unnamed(direction) {
            !("name" in picinfo[files[i]]); });
 }
 
            !("name" in picinfo[files[i]]); });
 }
 

-function mark_deleted() {
-  picinfo[files[input_index]].deleted = 1;
+function mark_deleted(method) {
+  picinfo[files[input_index]].deleted = method;

   save_picinfo();
   save_picinfo();

-  say("Deleted");
+  say(method);

 }
 
 function mark_not_deleted() {
 }
 
 function mark_not_deleted() {


@@ -209,7 +209,7 @@ Mousetrap.bind(['b', 'k'], function() { change_exposure(1); });
 Mousetrap.bind(['d', 'j'], function() { change_exposure(-1); });
 Mousetrap.bind('0', move_to_begenning);
 Mousetrap.bind('$', move_to_end);
 Mousetrap.bind(['d', 'j'], function() { change_exposure(-1); });
 Mousetrap.bind('0', move_to_begenning);
 Mousetrap.bind('$', move_to_end);

-Mousetrap.bind('x', mark_deleted);
+Mousetrap.bind('x', function(){ mark_deleted("deleted"); });

 Mousetrap.bind('X', mark_not_deleted);
 Mousetrap.bind('r', rotate);
 Mousetrap.bind('i', announce);
 Mousetrap.bind('X', mark_not_deleted);
 Mousetrap.bind('r', rotate);
 Mousetrap.bind('i', announce);