mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-30 19:00:09 +00:00
some minor refactoring...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
2dfd8c9663
commit
f2d6d7a5a9
@ -1020,6 +1020,53 @@ module.Journal = core.ImageGridFeatures.Feature({
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------
|
||||||
|
|
||||||
|
// XXX add setup/taredown...
|
||||||
|
var Clickable =
|
||||||
|
module.Clickable = core.ImageGridFeatures.Feature({
|
||||||
|
title: '',
|
||||||
|
doc: '',
|
||||||
|
|
||||||
|
tag: 'ui-clickable',
|
||||||
|
depends: ['ui'],
|
||||||
|
|
||||||
|
handlers: [
|
||||||
|
// setup click targets...
|
||||||
|
// XXX click only if we did not drag...
|
||||||
|
['updateImage',
|
||||||
|
function(res, gid){
|
||||||
|
var that = this
|
||||||
|
var img = this.ribbons.getImage(gid)
|
||||||
|
|
||||||
|
// set the clicker only once...
|
||||||
|
if(!img.prop('clickable')){
|
||||||
|
var x, y
|
||||||
|
img
|
||||||
|
.prop('clickable', true)
|
||||||
|
.on('mousedown touchstart', function(){
|
||||||
|
x = event.clientX
|
||||||
|
y = event.clientY
|
||||||
|
t = Date.now()
|
||||||
|
})
|
||||||
|
.on('mouseup touchend', function(){
|
||||||
|
if(x != null
|
||||||
|
&& Math.max(
|
||||||
|
Math.abs(x - event.clientX),
|
||||||
|
Math.abs(y - event.clientY)) < 5){
|
||||||
|
// this will prevent double clicks...
|
||||||
|
x = null
|
||||||
|
y = null
|
||||||
|
that.focusImage(that.ribbons.getElemGID($(this)))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}],
|
||||||
|
],
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------
|
//---------------------------------------------------------------------
|
||||||
|
|
||||||
var ConfigLocalStorageActions = actions.Actions({
|
var ConfigLocalStorageActions = actions.Actions({
|
||||||
@ -2590,7 +2637,8 @@ module.AutoRibbon = core.ImageGridFeatures.Feature({
|
|||||||
|
|
||||||
//---------------------------------------------------------------------
|
//---------------------------------------------------------------------
|
||||||
|
|
||||||
|
// Adds user management of different back-ends for low level ribbon
|
||||||
|
// alignment and placement...
|
||||||
var RibbonsPlacement =
|
var RibbonsPlacement =
|
||||||
module.RibbonsPlacement = core.ImageGridFeatures.Feature({
|
module.RibbonsPlacement = core.ImageGridFeatures.Feature({
|
||||||
title: '',
|
title: '',
|
||||||
@ -2639,55 +2687,12 @@ module.RibbonsPlacement = core.ImageGridFeatures.Feature({
|
|||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
// XXX add setup/taredown...
|
//---------------------------------------------------------------------
|
||||||
var Clickable =
|
// Direct control mode...
|
||||||
module.Clickable = core.ImageGridFeatures.Feature({
|
|
||||||
title: '',
|
|
||||||
doc: '',
|
|
||||||
|
|
||||||
tag: 'ui-clickable',
|
|
||||||
depends: [
|
|
||||||
'ui',
|
|
||||||
],
|
|
||||||
|
|
||||||
handlers: [
|
|
||||||
// setup click targets...
|
|
||||||
// XXX click only if we did not drag...
|
|
||||||
['updateImage',
|
|
||||||
function(res, gid){
|
|
||||||
var that = this
|
|
||||||
var img = this.ribbons.getImage(gid)
|
|
||||||
|
|
||||||
// set the clicker only once...
|
|
||||||
if(!img.prop('clickable')){
|
|
||||||
var x, y
|
|
||||||
img
|
|
||||||
.prop('clickable', true)
|
|
||||||
.on('mousedown touchstart', function(){
|
|
||||||
x = event.clientX
|
|
||||||
y = event.clientY
|
|
||||||
t = Date.now()
|
|
||||||
})
|
|
||||||
.on('mouseup touchend', function(){
|
|
||||||
if(x != null
|
|
||||||
&& Math.max(
|
|
||||||
Math.abs(x - event.clientX),
|
|
||||||
Math.abs(y - event.clientY)) < 5){
|
|
||||||
// this will prevent double clicks...
|
|
||||||
x = null
|
|
||||||
y = null
|
|
||||||
that.focusImage(that.ribbons.getElemGID($(this)))
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}],
|
|
||||||
],
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
// XXX add pinch-zoom...
|
|
||||||
// XXX add vertical scroll...
|
// XXX add vertical scroll...
|
||||||
|
// XXX add pinch-zoom...
|
||||||
// XXX disable drag in single image mode unless image is larger than the screen...
|
// XXX disable drag in single image mode unless image is larger than the screen...
|
||||||
|
|
||||||
// XXX BUG: current image indicator gets shown in random places...
|
// XXX BUG: current image indicator gets shown in random places...
|
||||||
// XXX BUG: this does it's work via css left which is both slow and
|
// XXX BUG: this does it's work via css left which is both slow and
|
||||||
// messes up positioning...
|
// messes up positioning...
|
||||||
@ -2755,7 +2760,6 @@ module.DirectControljQ = core.ImageGridFeatures.Feature({
|
|||||||
|
|
||||||
// XXX BUG: this does not account for scale when setting the initial drag
|
// XXX BUG: this does not account for scale when setting the initial drag
|
||||||
// position, resulting in a jump...
|
// position, resulting in a jump...
|
||||||
// XXX disable drag in single image mode unless image is larger than the screen...
|
|
||||||
// XXX do not use this for production -- GSAp has a bad license...
|
// XXX do not use this for production -- GSAp has a bad license...
|
||||||
var DirectControlGSAP =
|
var DirectControlGSAP =
|
||||||
module.DirectControlGSAP = core.ImageGridFeatures.Feature({
|
module.DirectControlGSAP = core.ImageGridFeatures.Feature({
|
||||||
@ -2801,7 +2805,7 @@ module.DirectControlGSAP = core.ImageGridFeatures.Feature({
|
|||||||
//---------------------------------------------------------------------
|
//---------------------------------------------------------------------
|
||||||
|
|
||||||
// XXX console / log / status bar
|
// XXX console / log / status bar
|
||||||
// XXX title bar
|
// XXX title bar (???)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user