flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 18:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed single image animation sync problems...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-11-23 01:21:56 +03:00
parent 66a6622ad6
commit 089d298692
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui (gen4)/features/ui-single-image.js
View File

@ -123,6 +123,8 @@ var SingleImageActions = actions.Actions({
} }
var viewer = this.ribbons.viewer var viewer = this.ribbons.viewer
var ribbon = this.ribbons.getRibbon()
var images = viewer.find('.ribbon .image') var images = viewer.find('.ribbon .image')
// no images loaded... // no images loaded...
@ -200,13 +202,11 @@ var SingleImageActions = actions.Actions({
if(o == 90 || o == 270){ if(o == 90 || o == 270){
img.style[a] = '' img.style[a] = ''
img.style[b] = n + 'px' img.style[b] = n + 'px'
img.style.margin = -(n - di)/2 +'px '+ (n - di)/2 +'px' img.style.margin = -(n - di)/2 +'px '+ (n - di)/2 +'px'
} else { } else {
img.style[a] = n + 'px' img.style[a] = n + 'px'
img.style[b] = '' img.style[b] = ''
img.style.margin = '' img.style.margin = ''
} }
}) })
@ -225,7 +225,6 @@ var SingleImageActions = actions.Actions({
.each(function(_, img){ .each(function(_, img){
img.style.width = '' img.style.width = ''
img.style.height = '' img.style.height = ''
img.style.margin = '' img.style.margin = ''
}) })
@ -398,17 +397,21 @@ module.SingleImageView = core.ImageGridFeatures.Feature({
// ribbon mode -- restore original image size... // ribbon mode -- restore original image size...
} else { } else {
this.ribbons.preventTransitions()
// reset image container size... // reset image container size...
this.ribbons.viewer.find('.image:not(.clone)') this.ribbons.viewer.find('.image:not(.clone)')
.each(function(_, img){ .each(function(_, img){
img.style.width = '' img.style.width = ''
img.style.height = '' img.style.height = ''
img.style.margin = '' img.style.margin = ''
}) })
// align ribbons... // align ribbons...
this.alignRibbons('now') this
.alignRibbons('now')
.ribbons
.restoreTransitions(true)
// update scale... // update scale...
if(state != pre_state){ if(state != pre_state){