flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-31 03:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

more refactoring and cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-06-02 20:28:42 +04:00
parent 6c551b2426
commit 32fc0411c8
1 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
ui/keybindings.js
View File

@ -8,11 +8,34 @@
var STEPS_TO_CHANGE_DIRECTION = 2
var _STEPS_LEFT_TO_CHANGE_DIRECTION = STEPS_TO_CHANGE_DIRECTION
// XXX code related to this needs testing...
var DIRECTION = 'next'
/*********************************************************************/
function updateDirection(direction){
if(DIRECTION != direction){
_STEPS_LEFT_TO_CHANGE_DIRECTION--
if(_STEPS_LEFT_TO_CHANGE_DIRECTION == 0){
DIRECTION = direction
_STEPS_LEFT_TO_CHANGE_DIRECTION = 2
}
} else {
_STEPS_LEFT_TO_CHANGE_DIRECTION = 2
}
}
function directionImage(reverse){
if(DIRECTION == (reverse ? 'prev' : 'next')){
nextImage()
} else {
prevImage()
}
}
/*********************************************************************/
var KEYBOARD_CONFIG = {
@ -106,7 +129,6 @@ var KEYBOARD_CONFIG = {
title: 'Single image mode',
doc: 'To toggle between this and ribbon modes press <b>Enter</b>.',
// XXX this should only work on single image mode...
F: doc('Toggle view proportions',
function(){
var mode = toggleImageProportions()
@ -158,6 +180,14 @@ var KEYBOARD_CONFIG = {
}),
// Help and info...
'?': doc('Show keyboard bindings',
function(){ toggleKeyboardHelp() }),
F1: doc('Show help',
function(){ toggleHelp() }),
H: 'F1',
// Basics...
// XXX STUB: use a real path browser...
O: doc('Open a directory path',
@ -178,15 +208,7 @@ var KEYBOARD_CONFIG = {
function(){
event.preventDefault()
// update direction...
if(DIRECTION != 'prev'){
_STEPS_LEFT_TO_CHANGE_DIRECTION--
if(_STEPS_LEFT_TO_CHANGE_DIRECTION == 0){
DIRECTION = 'prev'
_STEPS_LEFT_TO_CHANGE_DIRECTION = 2
}
} else {
_STEPS_LEFT_TO_CHANGE_DIRECTION = 2
}
updateDirection('prev')
prevImage()
centerRibbons()
}),
@ -197,15 +219,7 @@ var KEYBOARD_CONFIG = {
function(){
event.preventDefault()
// update direction...
if(DIRECTION != 'next'){
_STEPS_LEFT_TO_CHANGE_DIRECTION--
if(_STEPS_LEFT_TO_CHANGE_DIRECTION == 0){
DIRECTION = 'next'
_STEPS_LEFT_TO_CHANGE_DIRECTION = 2
}
} else {
_STEPS_LEFT_TO_CHANGE_DIRECTION = 2
}
updateDirection('next')
nextImage()
centerRibbons()
}),
@ -354,11 +368,7 @@ var KEYBOARD_CONFIG = {
default: doc('Mark current image and advance',
function(){
toggleImageMark()
if(DIRECTION == 'next'){
nextImage()
} else {
prevImage()
}
directionImage()
if(getImage().filter(':visible').length == 0){
centerView(focusImage(getImageBefore()))
}
@ -368,11 +378,7 @@ var KEYBOARD_CONFIG = {
shift: doc('Mark current image and return',
function(){
toggleImageMark()
if(DIRECTION == 'prev'){
nextImage()
} else {
prevImage()
}
directionImage(true)
if(getImage().filter(':visible').length == 0){
centerView(focusImage(getImageBefore()))
}
@ -382,10 +388,8 @@ var KEYBOARD_CONFIG = {
},
Ins: doc('Mark current image', function(){ toggleImageMark() }),
I: {
// XXX group this with other info stuff into a single on/off toggle...
default: doc('Toggle image info display',
function(){ toggleImageInfo() }),
// XXX STUB -- replace with a real info window...
shift: doc('Show current image info',
function(){ toggleImageInfoDrawer() }),
alt: doc('Toggle inline image info display',
@ -432,13 +436,6 @@ var KEYBOARD_CONFIG = {
E: 'F4',
'?': doc('Show keyboard bindings',
function(){ toggleKeyboardHelp() }),
F1: doc('Show help',
function(){ toggleHelp() }),
H: 'F1',
P: doc('Show options',
function(){ toggleOptionsUI() }),