From: Scott Worley Date: Fri, 28 Feb 2014 19:49:24 +0000 (-0800) Subject: move_to_unnamed() X-Git-Url: http://git.scottworley.com/picsort/commitdiff_plain/1433682c107c0cfe6e809f78018de55c89c775c3?hp=cd368e974b63917e537306af77de71ded9f8e1ef move_to_unnamed() Make move_to_nondeleted() generic, allowing the stopping criteria to be passed in. move_to_unnamed replaces move-to-deleted's bindings on N, P, H, and L. Move-to-deleted in turn moves behind an 'm' prefix. --- diff --git a/picsorter.js b/picsorter.js index b1c1bdf..c39e181 100644 --- a/picsorter.js +++ b/picsorter.js @@ -57,13 +57,26 @@ function toggle_zoom() { setpic(); } -function move_to_nondeleted(direction) { +function move_by_filter(direction, filter) { + // Keep moving in direction until filter is satisfied do { input_index += direction; - } while (picinfo[files[input_index]].deleted); + } while (!filter()); say(input_index + " " + (picinfo[files[input_index]].name || "")); setpic(); } +function move(direction) { + move_by_filter(direction, function() { return true; }); +} +function move_to_nondeleted(direction) { + move_by_filter(direction, function() { + return !("deleted" in picinfo[files[input_index]]); }); +} +function move_to_unnamed(direction) { + move_by_filter(direction, function() { + return !("deleted" in picinfo[files[input_index]]) && + !("name" in picinfo[files[input_index]]); }); +} function mark_deleted() { picinfo[files[input_index]].deleted = 1; @@ -104,8 +117,10 @@ Mousetrap.bind('z', toggle_zoom); Mousetrap.bind('Z', function() { $("#pic").toggleClass("fit_view"); }); 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(['N', 'L'], function() { move_to_unnamed(1); }); +Mousetrap.bind(['P', 'H'], function() { move_to_unnamed(-1); }); +Mousetrap.bind(['m n', 'm l'], function() { move(1); }); +Mousetrap.bind(['m n', 'm h'], function() { move(-1); }); Mousetrap.bind(['b', 'k'], function() { change_exposure(1); }); Mousetrap.bind(['d', 'j'], function() { change_exposure(-1); }); Mousetrap.bind('x', mark_deleted);