flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 18:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

some tweaking...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-01-18 11:37:08 +04:00
parent 6ffd4e1e84
commit 03b1245367
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/keybindings.js
View File

@ -311,6 +311,7 @@ var KEYBOARD_CONFIG = {
// XXX this breaks getKeyHandlers(...) when modes argument is given... // XXX this breaks getKeyHandlers(...) when modes argument is given...
'Ribbon view': { 'Ribbon view': {
pattern: '.viewer:not(.overlay):not(.single-image-mode)', pattern: '.viewer:not(.overlay):not(.single-image-mode)',
ignore: [ '#1', '#2', '#3', '#4', '#5', '#6', '#7', '#8', '#9', '#0' ],
Left: { Left: {
// XXX revise... // XXX revise...
@ -397,16 +398,16 @@ var KEYBOARD_CONFIG = {
}, },
// zooming... // zooming...
'#1': doc('Fit one image', function(){ return !fitNImages(1) }), '#1': doc('Fit one image', function(){ fitNImages(1) }),
'#2': doc('Fit two images', function(){ return !fitNImages(2) }), '#2': doc('Fit two images', function(){ fitNImages(2) }),
'#3': doc('Fit three images', function(){ return !fitNImages(3) }), '#3': doc('Fit three images', function(){ fitNImages(3) }),
'#4': doc('Fit four images', function(){ return !fitNImages(4) }), '#4': doc('Fit four images', function(){ fitNImages(4) }),
'#5': doc('Fit five images', function(){ return !fitNImages(5) }), '#5': doc('Fit five images', function(){ fitNImages(5) }),
'#6': doc('Fit six images', function(){ return !fitNImages(6) }), '#6': doc('Fit six images', function(){ fitNImages(6) }),
'#7': doc('Fit seven images', function(){ return !fitNImages(7) }), '#7': doc('Fit seven images', function(){ fitNImages(7) }),
'#8': doc('Fit eight images', function(){ return !fitNImages(8) }), '#8': doc('Fit eight images', function(){ fitNImages(8) }),
'#9': doc('Fit nine images', function(){ return !fitNImages(9) }), '#9': doc('Fit nine images', function(){ fitNImages(9) }),
'#0': doc('Fit maximum images', function(){ return !fitNImages(getScreenWidthInImages(CONFIG.min_image_size)) }), '#0': doc('Fit maximum images', function(){ fitNImages(getScreenWidthInImages(CONFIG.min_image_size)) }),
// cropping... // cropping...
C: doc('Show ribbon crop dialog', cropImagesDialog), C: doc('Show ribbon crop dialog', cropImagesDialog),

6
ui/lib/keyboard.js
View File

@ -249,17 +249,11 @@ function getKeyHandlers(key, modifiers, keybindings, modes, shifted_keys){
for(var title in keybindings){ for(var title in keybindings){
// If a key is ignored then look no further... // If a key is ignored then look no further...
/*
if(did_ignore && modes != 'all'){
break
}
*/
if(did_ignore){ if(did_ignore){
if(modes != 'all'){ if(modes != 'all'){
break break
} else { } else {
did_ignore = false did_ignore = false
// XXX do we actually need this???
if(modifiers != '?' && res[mode] != 'IGNORE'){ if(modifiers != '?' && res[mode] != 'IGNORE'){
res[mode] = [ res[mode], 'IGNORE NEXT'] res[mode] = [ res[mode], 'IGNORE NEXT']
} }