xobs/lca2020-pay-it-forward
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename padding config option to margin, better mobile support for scaled presentations (#310)

Browse Source
This commit is contained in:
hakimel 2013-01-29 18:59:36 -05:00
parent a20d3b6862
commit 1ca8306e2a
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -12,6 +12,8 @@
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="css/reveal.min.css"> <link rel="stylesheet" href="css/reveal.min.css">
<link rel="stylesheet" href="css/theme/default.css" id="theme"> <link rel="stylesheet" href="css/theme/default.css" id="theme">

27
js/reveal.js
View File

@ -22,7 +22,7 @@ var Reveal = (function(){
width: 1024, width: 1024,
height: 768, height: 768,
padding: 0.1, margin: 0.1,
// Display controls in the bottom right corner // Display controls in the bottom right corner
controls: true, controls: true,
@ -227,10 +227,6 @@ var Reveal = (function(){
function hideAddressBar() { function hideAddressBar() {
if( navigator.userAgent.match( /(iphone|ipod)/i ) ) { if( navigator.userAgent.match( /(iphone|ipod)/i ) ) {
// Give the page some scrollable overflow
document.documentElement.style.overflow = 'scroll';
document.body.style.height = '120%';
// Events that should trigger the address bar to hide // Events that should trigger the address bar to hide
window.addEventListener( 'load', removeAddressBar, false ); window.addEventListener( 'load', removeAddressBar, false );
window.addEventListener( 'orientationchange', removeAddressBar, false ); window.addEventListener( 'orientationchange', removeAddressBar, false );
@ -505,9 +501,18 @@ var Reveal = (function(){
*/ */
function removeAddressBar() { function removeAddressBar() {
if( window.orientation === 0 ) {
document.documentElement.style.overflow = 'scroll';
document.body.style.height = '120%';
}
else {
document.documentElement.style.overflow = '';
document.body.style.height = '100%';
}
setTimeout( function() { setTimeout( function() {
window.scrollTo( 0, 1 ); window.scrollTo( 0, 1 );
}, 0 ); }, 10 );
} }
@ -559,6 +564,10 @@ var Reveal = (function(){
var availableWidth = dom.wrapper.offsetWidth, var availableWidth = dom.wrapper.offsetWidth,
availableHeight = dom.wrapper.offsetHeight; availableHeight = dom.wrapper.offsetHeight;
// Reduce availabe space by margin
availableWidth -= ( availableHeight * config.margin );
availableHeight -= ( availableHeight * config.margin );
// Dimensions of the content // Dimensions of the content
var slideWidth = config.width, var slideWidth = config.width,
slideHeight = config.height; slideHeight = config.height;
@ -576,16 +585,12 @@ var Reveal = (function(){
dom.slides.style.width = slideWidth + 'px'; dom.slides.style.width = slideWidth + 'px';
dom.slides.style.height = slideHeight + 'px'; dom.slides.style.height = slideHeight + 'px';
// Reduce availabe space by padding
availableWidth = availableWidth - ( availableHeight * config.padding * 2 );
availableHeight = availableHeight - ( availableHeight * config.padding * 2 );
// Determine scale of content to fit within available space // Determine scale of content to fit within available space
var scale = Math.min( availableWidth / slideWidth, availableHeight / slideHeight ); var scale = Math.min( availableWidth / slideWidth, availableHeight / slideHeight );
// Prefer applying scale via zoom since Chrome blurs scaled content // Prefer applying scale via zoom since Chrome blurs scaled content
// with nested transforms // with nested transforms
if( typeof dom.slides.style.zoom !== 'undefined' ) { if( typeof dom.slides.style.zoom !== 'undefined' && !navigator.userAgent.match( /(iphone|ipod|android)/gi ) ) {
dom.slides.style.zoom = scale; dom.slides.style.zoom = scale;
} }
// Apply scale transform as a fallback // Apply scale transform as a fallback

4
js/reveal.min.js vendored
View File

File diff suppressed because one or more lines are too long