diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2014-11-05 19:28:09 +0100 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2014-11-05 19:28:09 +0100 |
| commit | 96b1ee9c39cc3dbffb704b34215775c91ce402c8 (patch) | |
| tree | 15c80bf9ebb0d03bc8e97bd77a8dae0f3e22e674 /js | |
| parent | 3126db0a460dcfa4bf7b51555180263c6e8832dd (diff) | |
| download | fosdem-2018-presentation-96b1ee9c39cc3dbffb704b34215775c91ce402c8.tar fosdem-2018-presentation-96b1ee9c39cc3dbffb704b34215775c91ce402c8.tar.gz | |
ignore calculating scale if only possible outcome is 1
Diffstat (limited to 'js')
| -rw-r--r-- | js/reveal.js | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/js/reveal.js b/js/reveal.js index fd651e1..312d5d1 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -125,13 +125,13 @@ theme: null, // Transition style - transition: 'slide', // none/fade/slide/convex/concave/zoom + transition: 'default', // none/fade/slide/convex/concave/zoom // Transition speed transitionSpeed: 'default', // default/fast/slow // 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 parallaxBackgroundImage: '', // CSS syntax, e.g. "a.jpg" @@ -1469,24 +1469,28 @@ dom.slides.style.width = size.width + 'px'; dom.slides.style.height = size.height + 'px'; - // Determine scale of content to fit within available space - scale = Math.min( size.presentationWidth / size.width, size.presentationHeight / size.height ); + // No point in calculating scale if the only possible + // 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 - scale = Math.max( scale, config.minScale ); - scale = Math.min( scale, config.maxScale ); + // Respect max/min scale settings + scale = Math.max( scale, config.minScale ); + scale = Math.min( scale, config.maxScale ); - // Prefer zooming in desktop Chrome so that content remains crisp - if( !isMobileDevice && /chrome/i.test( navigator.userAgent ) && typeof dom.slides.style.zoom !== 'undefined' ) { - dom.slides.style.zoom = scale; - } - // Apply scale transform as a fallback - else { - dom.slides.style.left = '50%'; - dom.slides.style.top = '50%'; - dom.slides.style.bottom = 'auto'; - dom.slides.style.right = 'auto'; - transformElement( dom.slides, 'translate(-50%, -50%) scale('+ scale +')' ); + // Prefer zooming in desktop Chrome so that content remains crisp + if( !isMobileDevice && /chrome/i.test( navigator.userAgent ) && typeof dom.slides.style.zoom !== 'undefined' ) { + dom.slides.style.zoom = scale; + } + // Apply scale transform as a fallback + else { + dom.slides.style.left = '50%'; + dom.slides.style.top = '50%'; + dom.slides.style.bottom = 'auto'; + dom.slides.style.right = 'auto'; + transformElement( dom.slides, 'translate(-50%, -50%) scale('+ scale +')' ); + } } // Select all slides, vertical and horizontal |