Skip to content

Commit

Permalink
FF fullscreen class + carousel animation bug
Browse files Browse the repository at this point in the history
  • Loading branch information
davidhellsing committed Oct 7, 2013
1 parent c13bc2e commit e961402
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/galleria.js
Original file line number Diff line number Diff line change
Expand Up @@ -1285,6 +1285,8 @@ Galleria = window.Galleria = function() {
return;
}

self.$( 'thumbnails' ).css('left', 0); // FF 24 bug

Utils.animate(self.get( 'thumbnails' ), {
left: num
},{
Expand Down Expand Up @@ -1519,7 +1521,7 @@ Galleria = window.Galleria = function() {
self.rescale();

if ( Galleria.MAC ) {
if ( Galleria.WEBKIT && !( Galleria.SAFARI && /version\/[1-5]/.test(NAV)) ) {
if ( !( Galleria.SAFARI && /version\/[1-5]/.test(NAV)) ) {
self.$('container').css('opacity', 0).addClass('fullscreen');
window.setTimeout(function() {
fullscreen.scale();
Expand Down Expand Up @@ -5309,12 +5311,12 @@ Galleria.addTheme = function( theme ) {
}, 1);
}
});
if ( !css ) {
Galleria.raise('No theme CSS loaded');
}
});
}

if ( !css ) {
Galleria.raise('No theme CSS loaded');
}
} else {

// pass
Expand Down

0 comments on commit e961402

Please sign in to comment.