merge in reset of vertical slides when returning to first slide #291
This commit is contained in:
1 parent
905ec83d53
commit
e46855096c
2 files changed
+9
-8
No files matched your search
+8
-7
@@ -12,6 +12,7 @@ var Reveal = (function(){
|
|||||||
var SLIDES_SELECTOR = '.reveal .slides section',
|
var SLIDES_SELECTOR = '.reveal .slides section',
|
||||||
HORIZONTAL_SLIDES_SELECTOR = '.reveal .slides>section',
|
HORIZONTAL_SLIDES_SELECTOR = '.reveal .slides>section',
|
||||||
VERTICAL_SLIDES_SELECTOR = '.reveal .slides>section.present>section',
|
VERTICAL_SLIDES_SELECTOR = '.reveal .slides>section.present>section',
|
||||||
|
HOME_SLIDE_SELECTOR = '.reveal .slides>section:first-child',
|
||||||
|
|
||||||
// Configurations defaults, can be overridden at initialization time
|
// Configurations defaults, can be overridden at initialization time
|
||||||
config = {
|
config = {
|
||||||
@@ -880,17 +881,17 @@ var Reveal = (function(){
|
|||||||
|
|
||||||
// Reset all slides upon navigate to home
|
// Reset all slides upon navigate to home
|
||||||
// Issue: #285
|
// Issue: #285
|
||||||
if ( document.querySelector(HOME_SLIDE_SELECTOR).classList.contains('present') ) {
|
if ( document.querySelector( HOME_SLIDE_SELECTOR ).classList.contains( 'present' ) ) {
|
||||||
// Launch async task
|
// Launch async task
|
||||||
setTimeout(function () {
|
setTimeout( function () {
|
||||||
var slides = toArray( document.querySelectorAll(HORIZONTAL_SLIDES_SELECTOR + '.stack')), i;
|
var slides = toArray( document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR + '.stack') ), i;
|
||||||
for ( i in slides ) {
|
for( i in slides ) {
|
||||||
if (slides[i]) {
|
if( slides[i] ) {
|
||||||
// Reset stack
|
// Reset stack
|
||||||
setPreviousVerticalIndex(slides[i], 0);
|
setPreviousVerticalIndex( slides[i], 0 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, 0);
|
}, 0 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Vendored
+1
-1
@@ -5,4 +5,4 @@
|
|||||||
*
|
*
|
||||||
* Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
|
* Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
|
||||||
*/
|
*/
|
||||||
var Reveal=function(){"use strict";function s(a){return m||l?(window.addEventListener("load",I,!1),A(d,a),u(),v(),void 0):(document.body.setAttribute("class","no-transforms"),void 0)}function t(){if(k.theme=document.querySelector("#theme"),k.wrapper=document.querySelector(".reveal"),k.slides=document.querySelector(".reveal .slides"),!k.wrapper.querySelector(".progress")&&d.progress){var a=document.createElement("div");a.classList.add("progress"),a.innerHTML="<span></span>",k.wrapper.appendChild(a)}if(!k.wrapper.querySelector(".controls")&&d.controls){var b=document.createElement("aside");b.classList.add("controls"),b.innerHTML='<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>',k.wrapper.appendChild(b)}if(!k.wrapper.querySelector(".state-background")){var c=document.createElement("div");c.classList.add("state-background"),k.wrapper.appendChild(c)}if(!k.wrapper.querySelector(".pause-overlay")){var e=document.createElement("div");e.classList.add("pause-overlay"),k.wrapper.appendChild(e)}k.progress=document.querySelector(".reveal .progress"),k.progressbar=document.querySelector(".reveal .progress span"),d.controls&&(k.controls=document.querySelector(".reveal .controls"),k.controlsLeft=B(document.querySelectorAll(".navigate-left")),k.controlsRight=B(document.querySelectorAll(".navigate-right")),k.controlsUp=B(document.querySelectorAll(".navigate-up")),k.controlsDown=B(document.querySelectorAll(".navigate-down")),k.controlsPrev=B(document.querySelectorAll(".navigate-prev")),k.controlsNext=B(document.querySelectorAll(".navigate-next")))}function u(){navigator.userAgent.match(/(iphone|ipod)/i)&&(document.documentElement.style.overflow="scroll",document.body.style.height="120%",window.addEventListener("load",F,!1),window.addEventListener("orientationchange",F,!1))}function v(){function g(){b.length&&head.js.apply(null,b),w()}for(var a=[],b=[],c=0,e=d.dependencies.length;e>c;c++){var f=d.dependencies[c];(!f.condition||f.condition())&&(f.async?b.push(f.src):a.push(f.src),"function"==typeof f.callback&&head.ready(f.src.match(/([\w\d_\-]*)\.?js$|[^\\\/]*$/i)[0],f.callback))}a.length?(head.ready(g),head.js.apply(null,a)):g()}function w(){t(),y(),x(),I(),Z(),cb(),setTimeout(function(){G("ready",{indexh:f,indexv:g,currentSlide:i})},1)}function x(){if(l===!1&&(d.transition="linear"),d.controls&&k.controls&&(k.controls.style.display="block"),d.progress&&k.progress&&(k.progress.style.display="block"),"default"!==d.transition&&k.wrapper.classList.add(d.transition),d.rtl&&k.wrapper.classList.add("rtl"),d.center&&k.wrapper.classList.add("center"),d.mouseWheel&&(document.addEventListener("DOMMouseScroll",nb,!1),document.addEventListener("mousewheel",nb,!1)),d.rollingLinks&&H(),d.theme&&k.theme){var a=k.theme.getAttribute("href"),b=/[^\/]*?(?=\.css)/,c=a.match(b)[0];d.theme!==c&&(a=a.replace(b,d.theme),k.theme.setAttribute("href",a))}}function y(){if(document.addEventListener("touchstart",kb,!1),document.addEventListener("touchmove",lb,!1),document.addEventListener("touchend",mb,!1),window.addEventListener("hashchange",pb,!1),window.addEventListener("resize",qb,!1),d.keyboard&&document.addEventListener("keydown",jb,!1),d.progress&&k.progress&&k.progress.addEventListener("click",E(ob),!1),d.controls&&k.controls){var a="ontouchstart"in window?"touchstart":"click";k.controlsLeft.forEach(function(b){b.addEventListener(a,E(db),!1)}),k.controlsRight.forEach(function(b){b.addEventListener(a,E(eb),!1)}),k.controlsUp.forEach(function(b){b.addEventListener(a,E(fb),!1)}),k.controlsDown.forEach(function(b){b.addEventListener(a,E(gb),!1)}),k.controlsPrev.forEach(function(b){b.addEventListener(a,E(hb),!1)}),k.controlsNext.forEach(function(b){b.addEventListener(a,E(ib),!1)})}}function z(){if(document.removeEventListener("keydown",jb,!1),document.removeEventListener("touchstart",kb,!1),document.removeEventListener("touchmove",lb,!1),document.removeEventListener("touchend",mb,!1),window.removeEventListener("hashchange",pb,!1),window.removeEventListener("resize",qb,!1),d.progress&&k.progress&&k.progress.removeEventListener("click",E(ob),!1),d.controls&&k.controls){var a="ontouchstart"in window?"touchstart":"click";k.controlsLeft.forEach(function(b){b.removeEventListener(a,E(db),!1)}),k.controlsRight.forEach(function(b){b.removeEventListener(a,E(eb),!1)}),k.controlsUp.forEach(function(b){b.removeEventListener(a,E(fb),!1)}),k.controlsDown.forEach(function(b){b.removeEventListener(a,E(gb),!1)}),k.controlsPrev.forEach(function(b){b.removeEventListener(a,E(hb),!1)}),k.controlsNext.forEach(function(b){b.removeEventListener(a,E(ib),!1)})}}function A(a,b){for(var c in b)a[c]=b[c]}function B(a){return Array.prototype.slice.call(a)}function D(a,b){var c=a.x-b.x,d=a.y-b.y;return Math.sqrt(c*c+d*d)}function E(a){return function(b){b.preventDefault(),a.call(null,b)}}function F(){setTimeout(function(){window.scrollTo(0,1)},0)}function G(a,b){var c=document.createEvent("HTMLEventsLine truncated
|
var Reveal=function(){"use strict";function t(a){return n||m?(window.addEventListener("load",J,!1),B(e,a),v(),w(),void 0):(document.body.setAttribute("class","no-transforms"),void 0)}function u(){if(l.theme=document.querySelector("#theme"),l.wrapper=document.querySelector(".reveal"),l.slides=document.querySelector(".reveal .slides"),!l.wrapper.querySelector(".progress")&&e.progress){var a=document.createElement("div");a.classList.add("progress"),a.innerHTML="<span></span>",l.wrapper.appendChild(a)}if(!l.wrapper.querySelector(".controls")&&e.controls){var b=document.createElement("aside");b.classList.add("controls"),b.innerHTML='<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>',l.wrapper.appendChild(b)}if(!l.wrapper.querySelector(".state-background")){var c=document.createElement("div");c.classList.add("state-background"),l.wrapper.appendChild(c)}if(!l.wrapper.querySelector(".pause-overlay")){var d=document.createElement("div");d.classList.add("pause-overlay"),l.wrapper.appendChild(d)}l.progress=document.querySelector(".reveal .progress"),l.progressbar=document.querySelector(".reveal .progress span"),e.controls&&(l.controls=document.querySelector(".reveal .controls"),l.controlsLeft=C(document.querySelectorAll(".navigate-left")),l.controlsRight=C(document.querySelectorAll(".navigate-right")),l.controlsUp=C(document.querySelectorAll(".navigate-up")),l.controlsDown=C(document.querySelectorAll(".navigate-down")),l.controlsPrev=C(document.querySelectorAll(".navigate-prev")),l.controlsNext=C(document.querySelectorAll(".navigate-next")))}function v(){navigator.userAgent.match(/(iphone|ipod)/i)&&(document.documentElement.style.overflow="scroll",document.body.style.height="120%",window.addEventListener("load",G,!1),window.addEventListener("orientationchange",G,!1))}function w(){function g(){b.length&&head.js.apply(null,b),x()}for(var a=[],b=[],c=0,d=e.dependencies.length;d>c;c++){var f=e.dependencies[c];(!f.condition||f.condition())&&(f.async?b.push(f.src):a.push(f.src),"function"==typeof f.callback&&head.ready(f.src.match(/([\w\d_\-]*)\.?js$|[^\\\/]*$/i)[0],f.callback))}a.length?(head.ready(g),head.js.apply(null,a)):g()}function x(){u(),z(),y(),J(),$(),db(),setTimeout(function(){H("ready",{indexh:g,indexv:h,currentSlide:j})},1)}function y(){if(m===!1&&(e.transition="linear"),e.controls&&l.controls&&(l.controls.style.display="block"),e.progress&&l.progress&&(l.progress.style.display="block"),"default"!==e.transition&&l.wrapper.classList.add(e.transition),e.rtl&&l.wrapper.classList.add("rtl"),e.center&&l.wrapper.classList.add("center"),e.mouseWheel&&(document.addEventListener("DOMMouseScroll",ob,!1),document.addEventListener("mousewheel",ob,!1)),e.rollingLinks&&I(),e.theme&&l.theme){var a=l.theme.getAttribute("href"),b=/[^\/]*?(?=\.css)/,c=a.match(b)[0];e.theme!==c&&(a=a.replace(b,e.theme),l.theme.setAttribute("href",a))}}function z(){if(document.addEventListener("touchstart",lb,!1),document.addEventListener("touchmove",mb,!1),document.addEventListener("touchend",nb,!1),window.addEventListener("hashchange",qb,!1),window.addEventListener("resize",rb,!1),e.keyboard&&document.addEventListener("keydown",kb,!1),e.progress&&l.progress&&l.progress.addEventListener("click",F(pb),!1),e.controls&&l.controls){var a="ontouchstart"in window?"touchstart":"click";l.controlsLeft.forEach(function(b){b.addEventListener(a,F(eb),!1)}),l.controlsRight.forEach(function(b){b.addEventListener(a,F(fb),!1)}),l.controlsUp.forEach(function(b){b.addEventListener(a,F(gb),!1)}),l.controlsDown.forEach(function(b){b.addEventListener(a,F(hb),!1)}),l.controlsPrev.forEach(function(b){b.addEventListener(a,F(ib),!1)}),l.controlsNext.forEach(function(b){b.addEventListener(a,F(jb),!1)})}}function A(){if(document.removeEventListener("keydown",kb,!1),document.removeEventListener("touchstart",lb,!1),document.removeEventListener("touchmove",mb,!1),document.removeEventListener("touchend",nb,!1),window.removeEventListener("hashchange",qb,!1),window.removeEventListener("resize",rb,!1),e.progress&&l.progress&&l.progress.removeEventListener("click",F(pb),!1),e.controls&&l.controls){var a="ontouchstart"in window?"touchstart":"click";l.controlsLeft.forEach(function(b){b.removeEventListener(a,F(eb),!1)}),l.controlsRight.forEach(function(b){b.removeEventListener(a,F(fb),!1)}),l.controlsUp.forEach(function(b){b.removeEventListener(a,F(gb),!1)}),l.controlsDown.forEach(function(b){b.removeEventListener(a,F(hb),!1)}),l.controlsPrev.forEach(function(b){b.removeEventListener(a,F(ib),!1)}),l.controlsNext.forEach(function(b){b.removeEventListener(a,F(jb),!1)})}}function B(a,b){for(var c in b)a[c]=b[c]}function C(a){return Array.prototype.slice.call(a)}function E(a,b){var c=a.x-b.x,d=a.y-b.y;return Math.sqrt(c*c+d*d)}function F(a){return function(b){b.preventDefault(),a.call(null,b)}}function G(){setTimeout(function(){window.scrollTo(0,1)},0)}function H(a,b){var c=document.createEvent("HTMLEventsLine truncated
|
||||||
Reference in new issue
Block a user