kfitz/presentations.kfitz.info
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

data-autoslide on vertical parent now applies to all child slides #685

Browse Source
This commit is contained in:
Hakim El Hattab committed 2013-11-07 09:12:49 -05:00
1 parent a119c83f86
commit 150cb81405
2 files changed
+9 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

js/reveal.js
+6 -1
View File
@@ -2327,12 +2327,17 @@ var Reveal = (function(){
if( currentSlide ) { if( currentSlide ) {
var parentAutoSlide = currentSlide.parentNode ? currentSlide.parentNode.getAttribute( 'data-autoslide' ) : null;
var slideAutoSlide = currentSlide.getAttribute( 'data-autoslide' );
// If the current slide has a data-autoslide use that, // If the current slide has a data-autoslide use that,
// otherwise use the config.autoSlide value // otherwise use the config.autoSlide value
var slideAutoSlide = currentSlide.getAttribute( 'data-autoslide' );
if( slideAutoSlide ) { if( slideAutoSlide ) {
autoSlide = parseInt( slideAutoSlide, 10 ); autoSlide = parseInt( slideAutoSlide, 10 );
} }
else if( parentAutoSlide ) {
autoSlide = parseInt( parentAutoSlide, 10 );
}
else { else {
autoSlide = config.autoSlide; autoSlide = config.autoSlide;
} }
js/reveal.min.js
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
/*! /*!
* reveal.js 2.6.0-dev (2013-11-07, 08:37) * reveal.js 2.6.0-dev (2013-11-07, 09:11)
* http://lab.hakim.se/reveal-js * http://lab.hakim.se/reveal-js
* MIT licensed * MIT licensed
* *
* Copyright (C) 2013 Hakim El Hattab, http://hakim.se * Copyright (C) 2013 Hakim El Hattab, http://hakim.se
*/ */
var Reveal=function(){"use strict";function a(a){if(b(),!bc.transforms2d&&!bc.transforms3d)return document.body.setAttribute("class","no-transforms"),void 0;window.addEventListener("load",C,!1);var d=Reveal.getQueryHash();"undefined"!=typeof d.dependencies&&delete d.dependencies,l(Yb,a),l(Yb,d),s(),c()}function b(){bc.transforms3d="WebkitPerspective"in document.body.style||"MozPerspective"in document.body.style||"msPerspective"in document.body.style||"OPerspective"in document.body.style||"perspective"in document.body.style,bc.transforms2d="WebkitTransform"in document.body.style||"MozTransform"in document.body.style||"msTransform"in document.body.style||"OTransform"in document.body.style||"transform"in document.body.style,bc.requestAnimationFrameMethod=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame,bc.requestAnimationFrame="function"==typeof bc.requestAnimationFrameMethod,bc.canvas=!!document.createElement("canvas").getContext,Sb=navigator.userAgent.match(/(iphone|ipod|android)/gi)}function c(){function a(){c.length&&head.js.apply(null,c),d()}for(var b=[],c=[],e=0,f=Yb.dependencies.length;f>e;e++){var g=Yb.dependencies[e];(!g.condition||g.condition())&&(g.async?c.push(g.src):b.push(g.src),"function"==typeof g.callback&&head.ready(g.src.match(/([\w\d_\-]*)\.?js$|[^\\\/]*$/i)[0],g.callback))}b.length?(head.ready(a),head.js.apply(null,b)):a()}function d(){f(),e(),i(),bb(),W(!0),setTimeout(function(){ac.slides.classList.remove("no-transition"),Zb=!0,u("ready",{indexh:Nb,indexv:Ob,currentSlide:Qb})},1)}function e(){var a=m(document.querySelectorAll(Vb));a.forEach(function(a){var b=m(a.querySelectorAll("section"));b.forEach(function(a,b){b>0&&a.classList.add("future")})})}function f(){ac.theme=document.querySelector("#theme"),ac.wrapper=document.querySelector(".reveal"),ac.slides=document.querySelector(".reveal .slides"),ac.slides.classList.add("no-transition"),ac.background=g(ac.wrapper,"div","backgrounds",null),ac.progress=g(ac.wrapper,"div","progress","<span></span>"),ac.progressbar=ac.progress.querySelector("span"),g(ac.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),g(ac.wrapper,"div","state-background",null),g(ac.wrapper,"div","pause-overlay",null),ac.controls=document.querySelector(".reveal .controls"),ac.controlsLeft=m(document.querySelectorAll(".navigate-left")),ac.controlsRight=m(document.querySelectorAll(".navigate-right")),ac.controlsUp=m(document.querySelectorAll(".navigate-up")),ac.controlsDown=m(document.querySelectorAll(".navigate-down")),ac.controlsPrev=m(document.querySelectorAll(".navigate-prev")),ac.controlsNext=m(document.querySelectorAll(".navigate-next"))}function g(a,b,c,d){var e=a.querySelector("."+c);return e||(e=document.createElement(b),e.classList.add(c),null!==d&&(e.innerHTML=d),a.appendChild(e)),e}function h(){function a(a,b){var c={background:a.getAttribute("data-background"),backgroundSize:a.getAttribute("data-background-size"),backgroundImage:a.getAttribute("data-background-image"),backgroundColor:a.getAttribute("data-background-color"),backgroundRepeat:a.getAttribute("data-background-repeat"),backgroundPosition:a.getAttribute("data-background-position"),backgroundTransition:a.getAttribute("data-background-transition")},d=document.createElement("div");return d.className="slide-background",c.background&&(/^(http|file|\/\/)/gi.test(c.background)||/\.(svg|png|jpg|jpeg|gif|bmp)$/gi.test(c.background)?d.style.backgroundImage="url("+c.background+")":d.style.background=c.background),(c.background||c.backgroundColor||c.backgroundImage)&&d.setAttribute("data-background-hash",c.background+c.backgroundSize+c.backgroundImage+c.backgroundColor+c.backgroundRepeat+c.backgroundPosition+c.backgroundTransition),c.backgroundSize&&(d.style.backgroundSize=c.backgroundSize),c.backgroundImage&&(d.style.backgroundImage='url("'+c.backgroundImage+'")'),c.backgroundColor&&(d.style.backgroundColor=c.backgroundColor),c.backgroundRepeat&&(d.style.backgroundRepeat=c.backgroundRepeat),c.backgroundPosition&&(d.style.backgroundPosition=c.backgroundPosition),c.backgroundTransition&&d.setAttribute("data-background-transition",c.backgroundTransition),b.appendChild(d),d}r()&&document.body.classList.add("print-pdf"),ac.background.innerHTML="",ac.background.classList.add("no-transition"),m(document.querySelectorAll(Vb)).forEach(function(b){var c;c=r()?a(b,b):a(b,ac.background),m(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})}),Yb.parallaxBackgroundImage?(ac.background.style.backgroundImage='url("'+Yb.parallaxBackgroundImage+'")',ac.background.style.backgroundSize=Yb.parallaxBackgroundSize,setTimeout(function(){ac.wrapper.classList.add("has-parallax-background")},1)):(ac.background.style.backgroundImage="",ac.wrapper.classList.remove("has-parallax-background"))}function i(a){var b=document.querySelectorAll(Ub).length;if(ac.wrapper.claLine truncated var Reveal=function(){"use strict";function a(a){if(b(),!bc.transforms2d&&!bc.transforms3d)return document.body.setAttribute("class","no-transforms"),void 0;window.addEventListener("load",C,!1);var d=Reveal.getQueryHash();"undefined"!=typeof d.dependencies&&delete d.dependencies,l(Yb,a),l(Yb,d),s(),c()}function b(){bc.transforms3d="WebkitPerspective"in document.body.style||"MozPerspective"in document.body.style||"msPerspective"in document.body.style||"OPerspective"in document.body.style||"perspective"in document.body.style,bc.transforms2d="WebkitTransform"in document.body.style||"MozTransform"in document.body.style||"msTransform"in document.body.style||"OTransform"in document.body.style||"transform"in document.body.style,bc.requestAnimationFrameMethod=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame,bc.requestAnimationFrame="function"==typeof bc.requestAnimationFrameMethod,bc.canvas=!!document.createElement("canvas").getContext,Sb=navigator.userAgent.match(/(iphone|ipod|android)/gi)}function c(){function a(){c.length&&head.js.apply(null,c),d()}for(var b=[],c=[],e=0,f=Yb.dependencies.length;f>e;e++){var g=Yb.dependencies[e];(!g.condition||g.condition())&&(g.async?c.push(g.src):b.push(g.src),"function"==typeof g.callback&&head.ready(g.src.match(/([\w\d_\-]*)\.?js$|[^\\\/]*$/i)[0],g.callback))}b.length?(head.ready(a),head.js.apply(null,b)):a()}function d(){f(),e(),i(),bb(),W(!0),setTimeout(function(){ac.slides.classList.remove("no-transition"),Zb=!0,u("ready",{indexh:Nb,indexv:Ob,currentSlide:Qb})},1)}function e(){var a=m(document.querySelectorAll(Vb));a.forEach(function(a){var b=m(a.querySelectorAll("section"));b.forEach(function(a,b){b>0&&a.classList.add("future")})})}function f(){ac.theme=document.querySelector("#theme"),ac.wrapper=document.querySelector(".reveal"),ac.slides=document.querySelector(".reveal .slides"),ac.slides.classList.add("no-transition"),ac.background=g(ac.wrapper,"div","backgrounds",null),ac.progress=g(ac.wrapper,"div","progress","<span></span>"),ac.progressbar=ac.progress.querySelector("span"),g(ac.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),g(ac.wrapper,"div","state-background",null),g(ac.wrapper,"div","pause-overlay",null),ac.controls=document.querySelector(".reveal .controls"),ac.controlsLeft=m(document.querySelectorAll(".navigate-left")),ac.controlsRight=m(document.querySelectorAll(".navigate-right")),ac.controlsUp=m(document.querySelectorAll(".navigate-up")),ac.controlsDown=m(document.querySelectorAll(".navigate-down")),ac.controlsPrev=m(document.querySelectorAll(".navigate-prev")),ac.controlsNext=m(document.querySelectorAll(".navigate-next"))}function g(a,b,c,d){var e=a.querySelector("."+c);return e||(e=document.createElement(b),e.classList.add(c),null!==d&&(e.innerHTML=d),a.appendChild(e)),e}function h(){function a(a,b){var c={background:a.getAttribute("data-background"),backgroundSize:a.getAttribute("data-background-size"),backgroundImage:a.getAttribute("data-background-image"),backgroundColor:a.getAttribute("data-background-color"),backgroundRepeat:a.getAttribute("data-background-repeat"),backgroundPosition:a.getAttribute("data-background-position"),backgroundTransition:a.getAttribute("data-background-transition")},d=document.createElement("div");return d.className="slide-background",c.background&&(/^(http|file|\/\/)/gi.test(c.background)||/\.(svg|png|jpg|jpeg|gif|bmp)$/gi.test(c.background)?d.style.backgroundImage="url("+c.background+")":d.style.background=c.background),(c.background||c.backgroundColor||c.backgroundImage)&&d.setAttribute("data-background-hash",c.background+c.backgroundSize+c.backgroundImage+c.backgroundColor+c.backgroundRepeat+c.backgroundPosition+c.backgroundTransition),c.backgroundSize&&(d.style.backgroundSize=c.backgroundSize),c.backgroundImage&&(d.style.backgroundImage='url("'+c.backgroundImage+'")'),c.backgroundColor&&(d.style.backgroundColor=c.backgroundColor),c.backgroundRepeat&&(d.style.backgroundRepeat=c.backgroundRepeat),c.backgroundPosition&&(d.style.backgroundPosition=c.backgroundPosition),c.backgroundTransition&&d.setAttribute("data-background-transition",c.backgroundTransition),b.appendChild(d),d}r()&&document.body.classList.add("print-pdf"),ac.background.innerHTML="",ac.background.classList.add("no-transition"),m(document.querySelectorAll(Vb)).forEach(function(b){var c;c=r()?a(b,b):a(b,ac.background),m(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})}),Yb.parallaxBackgroundImage?(ac.background.style.backgroundImage='url("'+Yb.parallaxBackgroundImage+'")',ac.background.style.backgroundSize=Yb.parallaxBackgroundSize,setTimeout(function(){ac.wrapper.classList.add("has-parallax-background")},1)):(ac.background.style.backgroundImage="",ac.wrapper.classList.remove("has-parallax-background"))}function i(a){var b=document.querySelectorAll(Ub).length;if(ac.wrapper.claLine truncated
}}}(); },removeEventListener:function(a,b,c){"addEventListener"in window&&(ac.wrapper||document.querySelector(".reveal")).removeEventListener(a,b,c)}}}();