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 a stupid bug made during refacroing Ribbons.updateRibbon(..) + some minor tuning...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2015-12-26 02:32:15 +03:00
parent c88482a807
commit 66863fb825
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui (gen4)/features/ui.js
View File

@ -2113,13 +2113,14 @@ var CurrentImageIndicatorActions = actions.Actions({
.addClass('current-marker ui-current-image-indicator') .addClass('current-marker ui-current-image-indicator')
.css({ .css({
opacity: '0', opacity: '0',
top: '0px', //top: '0px',
left: '0px', //left: '0px',
}) })
.appendTo(ribbon) .appendTo(ribbon)
.animate({ .animate({
'opacity': 1 'opacity': 1
}, fadein) }, fadein)
this.ribbons.dom.setOffset(marker, 0, 0)
// add marker to current ribbon... // add marker to current ribbon...
} else { } else {
@ -2157,7 +2158,8 @@ var CurrentImageIndicatorActions = actions.Actions({
} }
} }
css.left = cur[0].offsetLeft //css.left = cur[0].offsetLeft
this.ribbons.dom.setOffset(marker, cur[0].offsetLeft, 0)
marker.css(css) marker.css(css)
}], }],

10
ui (gen4)/index.html
View File

@ -75,11 +75,11 @@ body {
/* XXX not 100% sure about this... /* XXX not 100% sure about this...
*/ */
:not(.no-transitions) .current-marker:not(.no-transitions) { :not(.no-transitions) .current-marker:not(.no-transitions) {
-webkit-transition: left 0.1s ease-out; -webkit-transition: transform 0.1s ease-out;
-moz-transition: left 0.1s ease-out; -moz-transition: transform 0.1s ease-out;
-ms-transition: left 0.1s ease-out; -ms-transition: transform 0.1s ease-out;
-o-transition: left 0.1s ease-out; -o-transition: transform 0.1s ease-out;
transition: left 0.1s ease-out; transition: transform 0.1s ease-out;
} }
/* XXX should this be !important */ /* XXX should this be !important */

2
ui (gen4)/ribbons.js
View File

@ -1527,7 +1527,7 @@ var RibbonsPrototype = {
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.getOrigin(r) + dl * w) this.dom.setOffset(r, this.dom.getOffset(r).left + dl * w)
} }
} }
} }