dirk
/
why-cant-we-deploy-today
1
0
Fork 0
Code Releases Activity

ignore calculating scale if only possible outcome is 1

This commit is contained in:
Hakim El Hattab 2014-11-05 19:28:09 +01:00
parent 3126db0a46
commit 96b1ee9c39
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
js/reveal.js
View File

@ -125,13 +125,13 @@
theme: null, theme: null,
// Transition style // Transition style
transition: 'slide', // none/fade/slide/convex/concave/zoom transition: 'default', // none/fade/slide/convex/concave/zoom
// Transition speed // Transition speed
transitionSpeed: 'default', // default/fast/slow transitionSpeed: 'default', // default/fast/slow
// Transition style for full page slide backgrounds // Transition style for full page slide backgrounds
backgroundTransition: 'slide', // none/fade/slide/convex/concave/zoom backgroundTransition: 'default', // none/fade/slide/convex/concave/zoom
// Parallax background image // Parallax background image
parallaxBackgroundImage: '', // CSS syntax, e.g. "a.jpg" parallaxBackgroundImage: '', // CSS syntax, e.g. "a.jpg"
@ -1469,24 +1469,28 @@
dom.slides.style.width = size.width + 'px'; dom.slides.style.width = size.width + 'px';
dom.slides.style.height = size.height + 'px'; dom.slides.style.height = size.height + 'px';
// Determine scale of content to fit within available space // No point in calculating scale if the only possible
scale = Math.min( size.presentationWidth / size.width, size.presentationHeight / size.height ); // result is 1
if( config.minScale !== 1 || config.maxScale !== 1 ) {
// Determine scale of content to fit within available space
scale = Math.min( size.presentationWidth / size.width, size.presentationHeight / size.height );
// Respect max/min scale settings // Respect max/min scale settings
scale = Math.max( scale, config.minScale ); scale = Math.max( scale, config.minScale );
scale = Math.min( scale, config.maxScale ); scale = Math.min( scale, config.maxScale );
// Prefer zooming in desktop Chrome so that content remains crisp // Prefer zooming in desktop Chrome so that content remains crisp
if( !isMobileDevice && /chrome/i.test( navigator.userAgent ) && typeof dom.slides.style.zoom !== 'undefined' ) { if( !isMobileDevice && /chrome/i.test( navigator.userAgent ) && typeof dom.slides.style.zoom !== 'undefined' ) {
dom.slides.style.zoom = scale; dom.slides.style.zoom = scale;
} }
// Apply scale transform as a fallback // Apply scale transform as a fallback
else { else {
dom.slides.style.left = '50%'; dom.slides.style.left = '50%';
dom.slides.style.top = '50%'; dom.slides.style.top = '50%';
dom.slides.style.bottom = 'auto'; dom.slides.style.bottom = 'auto';
dom.slides.style.right = 'auto'; dom.slides.style.right = 'auto';
transformElement( dom.slides, 'translate(-50%, -50%) scale('+ scale +')' ); transformElement( dom.slides, 'translate(-50%, -50%) scale('+ scale +')' );
}
} }
// Select all slides, vertical and horizontal // Select all slides, vertical and horizontal