|
@@ -19,11 +19,16 @@ var Reveal = (function(){
|
|
|
|
|
|
|
|
|
|
|
|
- width: 1024,
|
|
|
- height: 768,
|
|
|
+ width: 960,
|
|
|
+ height: 700,
|
|
|
|
|
|
+
|
|
|
margin: 0.1,
|
|
|
|
|
|
+
|
|
|
+ minScale: 0.2,
|
|
|
+ maxScale: 1.4,
|
|
|
+
|
|
|
|
|
|
controls: true,
|
|
|
|
|
@@ -588,6 +593,10 @@ var Reveal = (function(){
|
|
|
|
|
|
var scale = Math.min( availableWidth / slideWidth, availableHeight / slideHeight );
|
|
|
|
|
|
+
|
|
|
+ scale = Math.max( scale, config.minScale );
|
|
|
+ scale = Math.min( scale, config.maxScale );
|
|
|
+
|
|
|
|
|
|
|
|
|
if( typeof dom.slides.style.zoom !== 'undefined' && !navigator.userAgent.match( /(iphone|ipod|android)/gi ) ) {
|
|
@@ -1123,7 +1132,7 @@ var Reveal = (function(){
|
|
|
var slideAutoSlide = slides[index].getAttribute( 'data-autoslide' );
|
|
|
if( slideAutoSlide ) {
|
|
|
autoSlide = parseInt( slideAutoSlide, 10 );
|
|
|
- }
|
|
|
+ }
|
|
|
else {
|
|
|
autoSlide = config.autoSlide;
|
|
|
}
|