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

fixed bugs with current image indicater, and ribbon shadows in single image mode..

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-12-07 14:07:10 +03:00
parent 150d29ac2b
commit 555ac6ec85
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui (gen4)/index.html
View File

@ -110,6 +110,10 @@ body {
box-shadow: 5px 5px 60px -5px rgba(0, 0, 0, 0.3); box-shadow: 5px 5px 60px -5px rgba(0, 0, 0, 0.3);
} }
.single-image-mode .ribbon {
box-shadow: none;
}
/* DEBUG stuff... */ /* DEBUG stuff... */
.container-center { .container-center {

5
ui (gen4)/lib/features.js
View File

@ -215,13 +215,14 @@ module.FeatureSet = {
res = res.concat(e.depends) res = res.concat(e.depends)
res.push(n) res.push(n)
}) })
// remove duplicates, keeping only the first occurance... lst = res
lst = res.filter(function(e, i, l){ return l.indexOf(e) == i })
// sort features via priority keeping the order as close to // sort features via priority keeping the order as close to
// manual as possible... // manual as possible...
var l = lst.length var l = lst.length
lst = lst lst = lst
// remove duplicates, keeping only the first occurance...
.filter(function(e, i, l){ return l.indexOf(e) == i })
// remove undefined features... // remove undefined features...
.filter(function(e){ return that[e] != null }) .filter(function(e){ return that[e] != null })
// build the sort table: [ <priority>, <rev-index>, <elem> ] // build the sort table: [ <priority>, <rev-index>, <elem> ]

3
ui (gen4)/ui.js
View File

@ -209,11 +209,11 @@ $(function(){
// XXX for some reason this is not visible when loading... // XXX for some reason this is not visible when loading...
a.setEmptyMsg('Loading...') a.setEmptyMsg('Loading...')
viewer.ImageGridFeatures.setup(a, [ viewer.ImageGridFeatures.setup(a, [
// features... // features...
'ui-ribbon-align-to-order', 'ui-ribbon-align-to-order',
'ui-single-image-view', 'ui-single-image-view',
'ui-partial-ribbons',
'fs-loader', 'fs-loader',
'app-control', 'app-control',
@ -222,7 +222,6 @@ $(function(){
'image-marks', 'image-marks',
'image-bookmarks', 'image-bookmarks',
'ui-partial-ribbons',
// chrome... // chrome...
'ui-animation', 'ui-animation',
'ui-bounds-indicators', 'ui-bounds-indicators',

9
ui (gen4)/viewer.js
View File

@ -1690,6 +1690,8 @@ var CurrentImageIndicatorActions = actions.Actions({
css.borderWidth = border css.borderWidth = border
// set border with a delay... // set border with a delay...
// NOTE: this is to prevent the ugly border resize before
// the scale on scale down animation starts...
} else { } else {
setTimeout(function(){ setTimeout(function(){
marker.css({ borderWidth: border }) marker.css({ borderWidth: border })
@ -1763,7 +1765,12 @@ module.CurrentImageIndicator = features.Feature(ImageGridFeatures, {
return function(){ return function(){
this.updateCurrentImageIndicator(target, false) this.updateCurrentImageIndicator(target, false)
//this.ribbons.restoreTransitions(m, true) //this.ribbons.restoreTransitions(m, true)
m.show() m
.show()
// NOTE: keeping display in inline style will
// prevent the element from being hidden
// by css...
.css({display: ''})
} }
} }
}], }],