reworked and fixed screen-oriented navigation via keyboard...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-12-04 23:33:35 +04:00
parent 088d4201d4
commit ee953d8de2
2 changed files with 25 additions and 20 deletions

View File

@ -313,6 +313,7 @@ var KEYBOARD_CONFIG = {
return false return false
}), }),
ctrl: 'prev-screen',
}, },
Right: { Right: {
alt: doc('Shift image right', alt: doc('Shift image right',
@ -337,6 +338,29 @@ var KEYBOARD_CONFIG = {
return false return false
}), }),
ctrl: 'next-screen',
},
'prev-screen': doc('Previous screen',
function(){
event.preventDefault()
prevScreenImages()
centerRibbons()
}),
'next-screen': doc('Next screen',
function(){
event.preventDefault()
nextScreenImages()
centerRibbons()
}),
Space: {
// screen-oriented movement...
ctrl: 'Right',
'ctrl+shift': 'prev-screen',
},
Backspace: {
// screen-oriented movement...
ctrl: 'Left',
'ctrl+shift': 'next-screen',
}, },
// zooming... // zooming...
@ -403,7 +427,6 @@ var KEYBOARD_CONFIG = {
prevImage() prevImage()
centerRibbons() centerRibbons()
}), }),
ctrl: 'prev-screen',
// XXX button not final... // XXX button not final...
'ctrl+shift': doc('Previous URL in history', loadURLHistoryPrev ), 'ctrl+shift': doc('Previous URL in history', loadURLHistoryPrev ),
@ -417,36 +440,17 @@ var KEYBOARD_CONFIG = {
nextImage() nextImage()
centerRibbons() centerRibbons()
}), }),
ctrl: 'next-screen',
// XXX button not final... // XXX button not final...
'ctrl+shift': doc('Next URL in history', loadURLHistoryNext ), 'ctrl+shift': doc('Next URL in history', loadURLHistoryNext ),
}, },
'prev-screen': doc('Previous screen',
function(){
event.preventDefault()
prevScreenImages()
centerRibbons()
}),
'next-screen': doc('Next screen',
function(){
event.preventDefault()
nextScreenImages()
centerRibbons()
}),
Space: { Space: {
default: 'Right', default: 'Right',
shift: 'Left', shift: 'Left',
// screen-oriented movement...
ctrl: 'Right',
'ctrl+shift': 'prev-screen',
}, },
Backspace: { Backspace: {
default: 'Left', default: 'Left',
shift: 'Right', shift: 'Right',
// screen-oriented movement...
ctrl: 'Left',
'ctrl+shift': 'next-screen',
}, },
Home: doc('First image', Home: doc('First image',
function(){ function(){

View File

@ -94,6 +94,7 @@ function setupDataBindings(viewer){
// skip all but the curent ribbon in single image view... // skip all but the curent ribbon in single image view...
if(toggleSingleImageMode('?') == 'on' && r != getRibbonIndex()){ if(toggleSingleImageMode('?') == 'on' && r != getRibbonIndex()){
console.log('>>>> skipping ribbon:', r)
return return
} }