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

started fixing current image indicator...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-06-19 02:18:09 +03:00
parent bd5fd9f505
commit c53f7c4eda
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui (gen4)/features/ui-chrome.js
View File

@ -171,7 +171,7 @@ var CurrentImageIndicatorActions = actions.Actions({
return return
} }
var scale = this.ribbons.scale() var scale = this.scale
var cur = this.ribbons.getImage(target) var cur = this.ribbons.getImage(target)
// NOTE: cur may be unloaded... // NOTE: cur may be unloaded...
var ribbon = this.ribbons.getRibbon(cur.length > 0 ? target : this.currentRibbon) var ribbon = this.ribbons.getRibbon(cur.length > 0 ? target : this.currentRibbon)
@ -264,6 +264,7 @@ var CurrentImageIndicatorActions = actions.Actions({
}], }],
}) })
var CurrentImageIndicator = var CurrentImageIndicator =
module.CurrentImageIndicator = core.ImageGridFeatures.Feature({ module.CurrentImageIndicator = core.ImageGridFeatures.Feature({
title: '', title: '',
@ -315,19 +316,25 @@ module.CurrentImageIndicator = core.ImageGridFeatures.Feature({
} }
} }
}], }],
// Change border size in the appropriate spot in the animation: // Change border size in the appropriate spot in the animation:
// - before animation when scaling up // - before animation when scaling up
// - after when scaling down // - after when scaling down
// This is done to make the visuals consistent... // This is done to make the visuals consistent...
//['fitImage.pre fitRibbon.pre setScale.pre', //['fitImage.pre fitRibbon.pre setScale.pre',
['resizing.pre', ['resizing.pre',
function(w1){ function(unit, w1){
var w0 = this.screenwidth var w0 = this[unit]
w1 = w1 || 1 w1 = w1 || 1
return function(){
this.updateCurrentImageIndicator(null, w0 > w1 ? 'before' : 'after') w0 > w1
} && this.updateCurrentImageIndicator(null, 'before')
//&& console.log('BEFORE!!!!')
}], }],
['resizingDone',
function(){
this.updateCurrentImageIndicator(null, 'before') }],
['shiftImageLeft.pre shiftImageRight.pre', ['shiftImageLeft.pre shiftImageRight.pre',
function(){ function(){
this.ribbons.viewer.find('.current-marker').hide() this.ribbons.viewer.find('.current-marker').hide()