mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-29 10:20:08 +00:00
moving to relative units on all positioning...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
108f01021e
commit
0e8c268630
@ -257,9 +257,15 @@ var CurrentImageIndicatorActions = actions.Actions({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* // set absolute offset...
|
||||||
this.ribbons.dom.setOffset(marker,
|
this.ribbons.dom.setOffset(marker,
|
||||||
cur[0].offsetLeft - (parseFloat(cur[0].style.marginLeft) || 0),
|
cur[0].offsetLeft - (parseFloat(cur[0].style.marginLeft) || 0),
|
||||||
0)
|
0)
|
||||||
|
*/
|
||||||
|
// set relative offset...
|
||||||
|
var W = Math.min(document.body.offsetWidth, document.body.offsetHeight)
|
||||||
|
var x = ((cur[0].offsetLeft - (parseFloat(cur[0].style.marginLeft) || 0))/W)*100 + 'vmin'
|
||||||
|
marker.transform({x: x, y: 0, z: 0})
|
||||||
|
|
||||||
marker.css(css)
|
marker.css(css)
|
||||||
}],
|
}],
|
||||||
|
|||||||
@ -555,9 +555,11 @@ module.ViewerActions = actions.Actions({
|
|||||||
}],
|
}],
|
||||||
centerViewer: ['- Interface/Center the viewer',
|
centerViewer: ['- Interface/Center the viewer',
|
||||||
function(target){
|
function(target){
|
||||||
|
/*
|
||||||
this
|
this
|
||||||
.centerImage(target)
|
.centerImage(target)
|
||||||
.centerRibbon(target)
|
.centerRibbon(target)
|
||||||
|
*/
|
||||||
}],
|
}],
|
||||||
|
|
||||||
focusImage: [
|
focusImage: [
|
||||||
|
|||||||
@ -1492,6 +1492,8 @@ var RibbonsPrototype = {
|
|||||||
// get/create the ribbon...
|
// get/create the ribbon...
|
||||||
var r = this.getRibbon(ribbon)
|
var r = this.getRibbon(ribbon)
|
||||||
|
|
||||||
|
var W = Math.min(document.body.offsetWidth, document.body.offsetHeight)
|
||||||
|
|
||||||
if(r.length == 0){
|
if(r.length == 0){
|
||||||
place = true
|
place = true
|
||||||
// no such ribbon exists, then create and append it in the end...
|
// no such ribbon exists, then create and append it in the end...
|
||||||
@ -1509,14 +1511,15 @@ var RibbonsPrototype = {
|
|||||||
// align only if ref is loaded...
|
// align only if ref is loaded...
|
||||||
if(ref.length > 0){
|
if(ref.length > 0){
|
||||||
var gid = this.getElemGID(ref)
|
var gid = this.getElemGID(ref)
|
||||||
var w = this.getVisibleImageSize('width', 1, ref)
|
var w = this.getVisibleImageSize('width', 1, ref) / W * 100
|
||||||
|
|
||||||
// calculate offset...
|
// calculate offset...
|
||||||
// NOTE: this will not work for non-square images...
|
// NOTE: this will not work for non-square images...
|
||||||
var dl = loaded.index(ref) - gids.indexOf(gid)
|
var dl = loaded.index(ref) - gids.indexOf(gid)
|
||||||
|
|
||||||
if(dl != 0){
|
if(dl != 0){
|
||||||
this.dom.setOffset(r, this.dom.getOffset(r).left + dl * w)
|
var x = parseFloat(r.transform('translate3d')[0]) + w * dl
|
||||||
|
r.transform({x: x + 'vmin', y: 0, z: 0})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1609,13 +1612,17 @@ var RibbonsPrototype = {
|
|||||||
// NOTE: this is a less general but simpler/faster alternative to
|
// NOTE: this is a less general but simpler/faster alternative to
|
||||||
// .updateRibbon(..)
|
// .updateRibbon(..)
|
||||||
// NOTE: this needs the ribbon to exist...
|
// NOTE: this needs the ribbon to exist...
|
||||||
|
//
|
||||||
|
// XXX revize offset compensation + cleanup...
|
||||||
|
// ...at this point offset compensation animates...
|
||||||
resizeRibbon: function(ribbon, left, right, transitions, reference){
|
resizeRibbon: function(ribbon, left, right, transitions, reference){
|
||||||
ribbon = this.getRibbon(ribbon)
|
ribbon = this.getRibbon(ribbon)
|
||||||
left = left || 0
|
left = left || 0
|
||||||
right = right || 0
|
right = right || 0
|
||||||
reference = this.getImage(reference)
|
reference = this.getImage(reference)
|
||||||
//scale = scale || this.scale()
|
//scale = scale || this.scale()
|
||||||
|
|
||||||
|
var W = Math.min(document.body.offsetWidth, document.body.offsetHeight)
|
||||||
var w = this.getVisibleImageSize('width', 1, reference)
|
var w = this.getVisibleImageSize('width', 1, reference)
|
||||||
|
|
||||||
var that = this
|
var that = this
|
||||||
@ -1662,7 +1669,7 @@ var RibbonsPrototype = {
|
|||||||
// XXX this assumes that all widths are equal...
|
// XXX this assumes that all widths are equal...
|
||||||
// ...we can't calculate image width unless it is attached...
|
// ...we can't calculate image width unless it is attached...
|
||||||
//var l = -left * (reference.outerWidth() / scale)
|
//var l = -left * (reference.outerWidth() / scale)
|
||||||
var l = -left * w
|
//var l = -left * w
|
||||||
|
|
||||||
// clear stuff...
|
// clear stuff...
|
||||||
$(marks)
|
$(marks)
|
||||||
@ -1671,14 +1678,23 @@ var RibbonsPrototype = {
|
|||||||
requestAnimationFrame(function(){
|
requestAnimationFrame(function(){
|
||||||
transitions || that.preventTransitions(ribbon)
|
transitions || that.preventTransitions(ribbon)
|
||||||
|
|
||||||
|
var a = images[-left].offsetLeft
|
||||||
|
|
||||||
unloaded
|
unloaded
|
||||||
.detach()
|
.detach()
|
||||||
.removeClass('moving current')
|
.removeClass('moving current')
|
||||||
// blank out images to prevent wrong image flashing
|
// blank out images to prevent wrong image flashing
|
||||||
// when reusing...
|
// when reusing...
|
||||||
.css('background-image', 'none')
|
.css('background-image', 'none')
|
||||||
|
|
||||||
// compensate for the offset...
|
// compensate for the offset...
|
||||||
that.dom.setOffset(ribbon, that.dom.getOffset(ribbon).left + l)
|
//that.dom.setOffset(ribbon, that.dom.getOffset(ribbon).left + l)
|
||||||
|
|
||||||
|
var b = images[-left].offsetLeft
|
||||||
|
var d = ((a - b) / W) * 100
|
||||||
|
var x = parseFloat(ribbon.transform('translate3d')[0]) + d
|
||||||
|
|
||||||
|
ribbon.transform({x: x + 'vmin', y: 0, z: 0})
|
||||||
|
|
||||||
transitions || that.restoreTransitions(ribbon, true)
|
transitions || that.restoreTransitions(ribbon, true)
|
||||||
})
|
})
|
||||||
@ -1734,11 +1750,14 @@ var RibbonsPrototype = {
|
|||||||
// XXX this assumes that all widths are equal...
|
// XXX this assumes that all widths are equal...
|
||||||
// ...we can't calculate image with unless it is attached...
|
// ...we can't calculate image with unless it is attached...
|
||||||
//var l = c * (reference.outerWidth() / scale)
|
//var l = c * (reference.outerWidth() / scale)
|
||||||
var l = c * w
|
//var l = c * w
|
||||||
|
|
||||||
requestAnimationFrame(function(){
|
requestAnimationFrame(function(){
|
||||||
transitions || that.preventTransitions(ribbon)
|
transitions || that.preventTransitions(ribbon)
|
||||||
|
|
||||||
|
// XXX is this the correct reference item -- can it be deleted above???
|
||||||
|
var a = images[0].offsetLeft
|
||||||
|
|
||||||
ribbon.prepend(loading)
|
ribbon.prepend(loading)
|
||||||
|
|
||||||
// XXX this is here to update the indicators...
|
// XXX this is here to update the indicators...
|
||||||
@ -1748,7 +1767,14 @@ var RibbonsPrototype = {
|
|||||||
})
|
})
|
||||||
|
|
||||||
// compensate for the offset...
|
// compensate for the offset...
|
||||||
that.dom.setOffset(ribbon, that.dom.getOffset(ribbon).left - l)
|
//that.dom.setOffset(ribbon, that.dom.getOffset(ribbon).left - l)
|
||||||
|
|
||||||
|
// XXX is this the correct reference item -- can it be deleted above???
|
||||||
|
var b = images[0].offsetLeft
|
||||||
|
var d = ((a - b) / W) * 100
|
||||||
|
var x = parseFloat(ribbon.transform('translate3d')[0]) + d
|
||||||
|
|
||||||
|
ribbon.transform({x: x + 'vmin', y: 0, z: 0})
|
||||||
|
|
||||||
transitions || that.restoreTransitions(ribbon, true)
|
transitions || that.restoreTransitions(ribbon, true)
|
||||||
})
|
})
|
||||||
@ -2289,12 +2315,20 @@ var RibbonsPrototype = {
|
|||||||
var l = target[0].offsetLeft
|
var l = target[0].offsetLeft
|
||||||
var w = target[0].offsetWidth
|
var w = target[0].offsetWidth
|
||||||
|
|
||||||
|
|
||||||
var image_offset = mode == 'before' ? 0
|
var image_offset = mode == 'before' ? 0
|
||||||
: mode == 'after' ? w
|
: mode == 'after' ? w
|
||||||
: w/2
|
: w/2
|
||||||
|
|
||||||
|
// relative offset to vmin...
|
||||||
|
var W = Math.min(document.body.offsetWidth, document.body.offsetHeight)
|
||||||
|
var x = (-(l + image_offset)/W)*100 + 'vmin'
|
||||||
|
|
||||||
|
// absolute offset...
|
||||||
|
//var x = -(l + image_offset)
|
||||||
|
|
||||||
//ribbon.css('transform', 'translateX(-'+ (l + image_offset) +'px)')
|
//ribbon.css('transform', 'translateX(-'+ (l + image_offset) +'px)')
|
||||||
ribbon.transform({x: -(l + image_offset), y: 0, z: 0})
|
ribbon.transform({x: x, y: 0, z: 0})
|
||||||
|
|
||||||
return this
|
return this
|
||||||
},
|
},
|
||||||
|
|||||||
@ -254,7 +254,7 @@ var transformEditor = function(){
|
|||||||
var unit = args[i] || ''
|
var unit = args[i] || ''
|
||||||
data[i] = typeof(arg) == typeof(123)
|
data[i] = typeof(arg) == typeof(123)
|
||||||
|| (typeof(arg) == typeof('str')
|
|| (typeof(arg) == typeof('str')
|
||||||
&& /^[0-9\.]+$/.test(arg)) ? arg + unit
|
&& /^-?[0-9\.]+$/.test(arg)) ? arg + unit
|
||||||
: arg == '' ? neutral + unit
|
: arg == '' ? neutral + unit
|
||||||
: arg
|
: arg
|
||||||
res[i] = arg
|
res[i] = arg
|
||||||
@ -272,7 +272,7 @@ var transformEditor = function(){
|
|||||||
.map(function(arg, i){
|
.map(function(arg, i){
|
||||||
var unit = args[i] || ''
|
var unit = args[i] || ''
|
||||||
return arg.slice(-unit.length) == unit
|
return arg.slice(-unit.length) == unit
|
||||||
|| /^[0-9\.]+$/.test(arg)?
|
|| /^-?[0-9\.]+$/.test(arg)?
|
||||||
parseFloat(arg)
|
parseFloat(arg)
|
||||||
: arg
|
: arg
|
||||||
})
|
})
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user