flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-11-04 13:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor tweaks and bugfixes...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-01-01 07:41:53 +04:00
parent f757f776ff
commit 9598d7ab7d
5 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/data.js
View File

@ -57,6 +57,16 @@ var CONFIG = {
// Application name...
app_name: 'ImageGrid.Viewer',
// Navigation...
//
// The number of moves after which the default direction will be
// changed...
//
// This affects:
// - default direction to focus after current image is shifted
// - default direction of the slideshow
steps_to_change_direction: 2,
// Loader configuration...
//
// load_screens

24
ui/keybindings.js
View File

@ -6,8 +6,7 @@
//var DEBUG = DEBUG != null ? DEBUG : true
var STEPS_TO_CHANGE_DIRECTION = 2
var _STEPS_LEFT_TO_CHANGE_DIRECTION = STEPS_TO_CHANGE_DIRECTION
var _STEPS_LEFT_TO_CHANGE_DIRECTION = CONFIG.steps_to_change_direction
var DIRECTION = 'next'
@ -19,10 +18,10 @@ function updateDirection(direction){
_STEPS_LEFT_TO_CHANGE_DIRECTION--
if(_STEPS_LEFT_TO_CHANGE_DIRECTION == 0){
DIRECTION = direction
_STEPS_LEFT_TO_CHANGE_DIRECTION = 2
_STEPS_LEFT_TO_CHANGE_DIRECTION = CONFIG.steps_to_change_direction
}
} else {
_STEPS_LEFT_TO_CHANGE_DIRECTION = 2
_STEPS_LEFT_TO_CHANGE_DIRECTION = CONFIG.steps_to_change_direction
}
}
@ -293,17 +292,19 @@ var KEYBOARD_CONFIG = {
title: 'Ribbon view',
Left: {
// XXX revise...
alt: doc('Shift image left',
function(){
event.preventDefault()
shiftImageLeft()
centerView(null, 'css')
// XXX for some odd reason centerRibbons does
// something really odd here...
// something really odd here -- images get to
// correct positions but the align is totally
// wrong...
// ...race condition???
//centerRibbons()
// XXX HACK...
// XXX this still gets misaligned sometimes but this
// is likely due to one of the align bugs
if(window._center_ribbon_delay != null){
clearTimeout(_center_ribbon_delay)
}
@ -317,18 +318,19 @@ var KEYBOARD_CONFIG = {
ctrl: 'prev-screen',
},
Right: {
// XXX revise...
alt: doc('Shift image right',
function(){
event.preventDefault()
shiftImageRight()
centerView(null, 'css')
// XXX for some odd reason centerRibbons does
// something really odd here...
// something really odd here -- images get to
// correct positions but the align is totally
// wrong...
// ...race condition???
//centerRibbons()
// XXX HACK...
// XXX this still gets misaligned sometimes but this
// is likely due to one of the align bugs
// (see: TODO.otl)
if(window._center_ribbon_delay != null){
clearTimeout(_center_ribbon_delay)
}

8
ui/marks.js
View File

@ -33,8 +33,14 @@ function _addMark(cls, gid, image){
mark = $('<div class="mark"/>')
.addClass(gid)
.addClass(cls)
.insertAfter(image)
//.insertAfter(image)
}
// make sure the mark is explicitly after the image...
// XXX think of an eficient way to test if we need to re-insert...
mark
.insertAfter(image)
return mark
}
function _removeMark(cls, gid, image){

2
ui/ribbons.js
View File

@ -1169,7 +1169,7 @@ function zoomOut(){
/************************************************** Editor Actions ***/
// NOTE: for shiftImageRight/shiftImageLeft see data.js, as they depend
// NOTE: for shiftImageRight/shiftImageLeft see sort.js, as they depend
// on data ordering...
function shiftImageTo(image, direction, moving, force_create_ribbon){

1
ui/ui.js
View File

@ -1335,6 +1335,7 @@ function setupUI(viewer){
'focusingImage',
'fittingImages',
//'updatingImageProportions',
'horizontalSiftedImage',
].join(' '),
function(){
updateCurrentMarker()