From 1e8799042aa43be58c9eee54f54a0f26d9c593ce Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sun, 15 Feb 2015 21:59:14 +0300 Subject: [PATCH] fixed marking action... Signed-off-by: Alex A. Naanou --- ui (gen4)/experiments/browse-dialog.html | 33 ++++++++++++++++++++++++ ui/keybindings.js | 24 ++--------------- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/ui (gen4)/experiments/browse-dialog.html b/ui (gen4)/experiments/browse-dialog.html index 7abd4feb..1de2c4c9 100755 --- a/ui (gen4)/experiments/browse-dialog.html +++ b/ui (gen4)/experiments/browse-dialog.html @@ -21,6 +21,11 @@ padding: 5px; font-family: sans-serif; } +/* +.browse:not(:focus) { + opacity: 0.8; +} +*/ .browse .v-block { width: 100%; height: auto; @@ -62,6 +67,15 @@ .browse .path .dir:after { content: "/"; } +/* XXX need to make this resizable up but only to a certain size (~80vh) */ +/* +.browse .list { + max-height: 50vh; +} +.browse .list:empty { + display: block; +} +*/ .browse .list div { padding: 5px; padding-left: 10px; @@ -110,6 +124,25 @@ var TREE = { }, }, file: 'this is a file', + /* + dir_d: {}, + dir_e: {}, + dir_f: {}, + dir_g: {}, + dir_h: {}, + dir_i: {}, + dir_j: {}, + dir_k: {}, + dir_l: {}, + dir_m: {}, + dir_o: {}, + dir_p: {}, + dir_q: {}, + dir_r: {}, + dir_s: {}, + dir_t: {}, + dir_u: {}, + */ } // add some recursion for testing... TREE.dir_d = TREE.dir_c.dir_b diff --git a/ui/keybindings.js b/ui/keybindings.js index b0ca60cf..0185cfd8 100755 --- a/ui/keybindings.js +++ b/ui/keybindings.js @@ -714,31 +714,11 @@ var KEYBOARD_CONFIG = { // NOTE: marking does not change move direction... // XXX should this toggle or set mark to on? default: doc('Mark current image and advance', - function(){ - toggleMark('on') - directionImage() - // XXX do we need this??? - //if(getImage().filter(':visible').length == 0){ - // centerView(focusImage(getImageBefore())) - //} - centerRibbons() - }), - // same as default but in reverse direction... - shift: doc('Mark current image and return', - function(){ - toggleMark('on') - directionImage(true) - // XXX do we need this??? - //if(getImage().filter(':visible').length == 0){ - // centerView(focusImage(getImageBefore())) - //} - centerRibbons() - }), + function(){ toggleMark() }), ctrl: doc('Show mark dialog', function(){ markImagesDialog() }), }, Ins: doc('Toggle mark on current image', function(){ toggleMark() }), - 'invert-marks': doc('Invert image marks', - function(){ invertImageMarks() }), + 'invert-marks': doc('Invert image marks', function(){ invertImageMarks() }), A: { // XXX does not yet work with DATA (???) //shift: doc('Toggle marks in current contagious block',