|
@@ -17,8 +17,11 @@ var Reveal = (function(){
|
|
|
|
|
|
config = {
|
|
|
|
|
|
+
|
|
|
+
|
|
|
width: 1024,
|
|
|
height: 768,
|
|
|
+
|
|
|
padding: 0.1,
|
|
|
|
|
|
|
|
@@ -552,16 +555,49 @@ var Reveal = (function(){
|
|
|
*/
|
|
|
function layout() {
|
|
|
|
|
|
- dom.slides.style.width = config.width + 'px';
|
|
|
- dom.slides.style.height = config.height + 'px';
|
|
|
+
|
|
|
+ var availableWidth = dom.wrapper.offsetWidth,
|
|
|
+ availableHeight = dom.wrapper.offsetHeight;
|
|
|
+
|
|
|
+
|
|
|
+ var slideWidth = config.width,
|
|
|
+ slideHeight = config.height;
|
|
|
+
|
|
|
+
|
|
|
+ if( typeof slideWidth === 'string' && /%$/.test( slideWidth ) ) {
|
|
|
+ slideWidth = parseInt( slideWidth, 10 ) / 100 * availableWidth;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ if( typeof slideHeight === 'string' && /%$/.test( slideHeight ) ) {
|
|
|
+ slideHeight = parseInt( slideHeight, 10 ) / 100 * availableHeight;
|
|
|
+ }
|
|
|
|
|
|
- var availableWidth = window.innerWidth - ( window.innerWidth * config.padding * 2 ),
|
|
|
- availableHeight = window.innerHeight - ( window.innerHeight * config.padding * 2 );
|
|
|
+ dom.slides.style.width = slideWidth + 'px';
|
|
|
+ dom.slides.style.height = slideHeight + 'px';
|
|
|
|
|
|
- var scale = Math.min( availableWidth / config.width, availableHeight / config.height );
|
|
|
+
|
|
|
+ availableWidth = availableWidth - ( availableHeight * config.padding * 2 );
|
|
|
+ availableHeight = availableHeight - ( availableHeight * config.padding * 2 );
|
|
|
|
|
|
-
|
|
|
- dom.slides.style.zoom = scale;
|
|
|
+
|
|
|
+ var scale = Math.min( availableWidth / slideWidth, availableHeight / slideHeight );
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ if( typeof dom.slides.style.zoom !== 'undefined' ) {
|
|
|
+ dom.slides.style.zoom = scale;
|
|
|
+ }
|
|
|
+
|
|
|
+ else {
|
|
|
+ var transform = 'translate(-50%, -50%) scale('+ scale +') translate(50%, 50%)';
|
|
|
+
|
|
|
+ dom.slides.style.WebkitTransform = transform;
|
|
|
+ dom.slides.style.MozTransform = transform;
|
|
|
+ dom.slides.style.msTransform = transform;
|
|
|
+ dom.slides.style.OTransform = transform;
|
|
|
+ dom.slides.style.transform = transform;
|
|
|
+ }
|
|
|
|
|
|
if( config.center ) {
|
|
|
|
|
@@ -569,7 +605,7 @@ var Reveal = (function(){
|
|
|
var slides = toArray( document.querySelectorAll( SLIDES_SELECTOR ) );
|
|
|
|
|
|
|
|
|
- var minTop = -dom.wrapper.offsetHeight / 2;
|
|
|
+ var minTop = -slideHeight / 2;
|
|
|
|
|
|
for( var i = 0, len = slides.length; i < len; i++ ) {
|
|
|
var slide = slides[ i ];
|