minor tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-10-21 21:17:44 +04:00
parent d9d1903d24
commit 84953a947e
2 changed files with 18 additions and 5 deletions

View File

@ -101,13 +101,21 @@ module.GLOBAL_KEYBOARD = {
}, },
// XXX testing... // XXX testing...
Home: 'firstImage', Home: {
End: 'lastImage', default: 'firstImage',
ctrl: 'firstRibbon',
},
End: {
default: 'lastImage',
ctrl: 'lastRibbon',
},
Left: { Left: {
default: 'prevImage', default: 'prevImage',
alt: 'shiftImageLeft!', alt: 'shiftImageLeft!',
ctrl: 'prevScreen', ctrl: 'prevScreen',
}, },
PgUp: 'prevScreen',
PgDown: 'nextScreen',
Right: { Right: {
default: 'nextImage', default: 'nextImage',
alt: 'shiftImageRight!', alt: 'shiftImageRight!',

View File

@ -218,12 +218,10 @@ actions.Actions({
function(){ this.nextImage(this.data.order) }], function(){ this.nextImage(this.data.order) }],
firstRibbon: ['Focus previous ribbon', firstRibbon: ['Focus previous ribbon',
function(){ this.focusRibbon('fisrt') }], function(){ this.focusRibbon('first') }],
lastRibbon: ['Focus next ribbon', lastRibbon: ['Focus next ribbon',
function(){ this.focusRibbon('last') }], function(){ this.focusRibbon('last') }],
// XXX check that going up/down must be stable and not drift to
// adjacent images...
prevRibbon: ['Focus previous ribbon', prevRibbon: ['Focus previous ribbon',
function(){ this.focusRibbon('before') }], function(){ this.focusRibbon('before') }],
nextRibbon: ['Focus next ribbon', nextRibbon: ['Focus next ribbon',
@ -746,6 +744,12 @@ module.BoundsIndicators = {
.on('prevImage.pre', tag, didAdvance('start')) .on('prevImage.pre', tag, didAdvance('start'))
.on('nextRibbon.pre', tag, didAdvance('bottom')) .on('nextRibbon.pre', tag, didAdvance('bottom'))
.on('prevRibbon.pre', tag, didAdvance('top')) .on('prevRibbon.pre', tag, didAdvance('top'))
// XXX not sure about these...
.on('lastImage.pre', tag, didAdvance('end'))
.on('firstImage.pre', tag, didAdvance('start'))
.on('firstRibbon.pre', tag, didAdvance('top'))
.on('lastRibbon.pre', tag, didAdvance('bottom'))
// vertical shifting... // vertical shifting...
.on('shiftImageUp.post', tag, .on('shiftImageUp.post', tag,
function(){ function(){
@ -755,6 +759,7 @@ module.BoundsIndicators = {
function(){ function(){
that.flashIndicator(actions.ribbons.viewer, 'down') that.flashIndicator(actions.ribbons.viewer, 'down')
}) })
// horizontal shifting... // horizontal shifting...
.on('shiftImageLeft.pre', tag, .on('shiftImageLeft.pre', tag,
function(target){ function(target){