add api method for retrieving progress
This commit is contained in:
1 parent
8c32e2e967
commit
6e9a33cf1f
2 files changed
+52
-39
No files matched your search
+49
-36
@@ -1882,42 +1882,7 @@ var Reveal = (function(){
|
||||
// Update progress if enabled
|
||||
if( config.progress && dom.progress ) {
|
||||
|
||||
var horizontalSlides = toArray( document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ) );
|
||||
|
||||
// The number of past and total slides
|
||||
var totalCount = document.querySelectorAll( SLIDES_SELECTOR + ':not(.stack)' ).length;
|
||||
var pastCount = 0;
|
||||
|
||||
// Step through all slides and count the past ones
|
||||
mainLoop: for( var i = 0; i < horizontalSlides.length; i++ ) {
|
||||
|
||||
var horizontalSlide = horizontalSlides[i];
|
||||
var verticalSlides = toArray( horizontalSlide.querySelectorAll( 'section' ) );
|
||||
|
||||
for( var j = 0; j < verticalSlides.length; j++ ) {
|
||||
|
||||
// Stop as soon as we arrive at the present
|
||||
if( verticalSlides[j].classList.contains( 'present' ) ) {
|
||||
break mainLoop;
|
||||
}
|
||||
|
||||
pastCount++;
|
||||
|
||||
}
|
||||
|
||||
// Stop as soon as we arrive at the present
|
||||
if( horizontalSlide.classList.contains( 'present' ) ) {
|
||||
break;
|
||||
}
|
||||
|
||||
// Don't count the wrapping section for vertical slides
|
||||
if( horizontalSlide.classList.contains( 'stack' ) === false ) {
|
||||
pastCount++;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
dom.progressbar.style.width = ( pastCount / ( totalCount - 1 ) ) * window.innerWidth + 'px';
|
||||
dom.progressbar.style.width = getProgress() * window.innerWidth + 'px';
|
||||
|
||||
}
|
||||
|
||||
@@ -2209,6 +2174,51 @@ var Reveal = (function(){
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a value ranging from 0-1 that represents
|
||||
* how far into the presentation we have navigated.
|
||||
*/
|
||||
function getProgress() {
|
||||
|
||||
var horizontalSlides = toArray( document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ) );
|
||||
|
||||
// The number of past and total slides
|
||||
var totalCount = document.querySelectorAll( SLIDES_SELECTOR + ':not(.stack)' ).length;
|
||||
var pastCount = 0;
|
||||
|
||||
// Step through all slides and count the past ones
|
||||
mainLoop: for( var i = 0; i < horizontalSlides.length; i++ ) {
|
||||
|
||||
var horizontalSlide = horizontalSlides[i];
|
||||
var verticalSlides = toArray( horizontalSlide.querySelectorAll( 'section' ) );
|
||||
|
||||
for( var j = 0; j < verticalSlides.length; j++ ) {
|
||||
|
||||
// Stop as soon as we arrive at the present
|
||||
if( verticalSlides[j].classList.contains( 'present' ) ) {
|
||||
break mainLoop;
|
||||
}
|
||||
|
||||
pastCount++;
|
||||
|
||||
}
|
||||
|
||||
// Stop as soon as we arrive at the present
|
||||
if( horizontalSlide.classList.contains( 'present' ) ) {
|
||||
break;
|
||||
}
|
||||
|
||||
// Don't count the wrapping section for vertical slides
|
||||
if( horizontalSlide.classList.contains( 'stack' ) === false ) {
|
||||
pastCount++;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return pastCount / ( totalCount - 1 );
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if this presentation is running inside of the
|
||||
* speaker notes window.
|
||||
@@ -3399,6 +3409,9 @@ var Reveal = (function(){
|
||||
getState: getState,
|
||||
setState: setState,
|
||||
|
||||
// Presentation progress on range of 0-1
|
||||
getProgress: getProgress,
|
||||
|
||||
// Returns the indices of the current, or specified, slide
|
||||
getIndices: getIndices,
|
||||
|
||||
|
||||
Vendored
+3
-3
@@ -1,9 +1,9 @@
|
||||
/*!
|
||||
* reveal.js 2.7.0-dev (2014-03-02, 13:01)
|
||||
* reveal.js 2.7.0-dev (2014-03-12, 22:25)
|
||||
* http://lab.hakim.se/reveal-js
|
||||
* MIT licensed
|
||||
*
|
||||
* Copyright (C) 2014 Hakim El Hattab, http://hakim.se
|
||||
*/
|
||||
var Reveal=function(){"use strict";function a(a){if(b(),!jc.transforms2d&&!jc.transforms3d)return document.body.setAttribute("class","no-transforms"),void 0;window.addEventListener("load",B,!1);var d=Reveal.getQueryHash();"undefined"!=typeof d.dependencies&&delete d.dependencies,k(ec,a),k(ec,d),s(),c()}function b(){jc.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,jc.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,jc.requestAnimationFrameMethod=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame,jc.requestAnimationFrame="function"==typeof jc.requestAnimationFrameMethod,jc.canvas=!!document.createElement("canvas").getContext,$b=navigator.userAgent.match(/(iphone|ipod|android)/gi)}function c(){function a(){e.length&&head.js.apply(null,e),d()}function b(b){head.ready(b.src.match(/([\w\d_\-]*)\.?js$|[^\\\/]*$/i)[0],function(){"function"==typeof b.callback&&b.callback.apply(this),0===--f&&a()})}for(var c=[],e=[],f=0,g=0,h=ec.dependencies.length;h>g;g++){var i=ec.dependencies[g];(!i.condition||i.condition())&&(i.async?e.push(i.src):c.push(i.src),b(i))}c.length?(f=c.length,head.js.apply(null,c)):a()}function d(){e(),T(),h(),fb(),$(!0),setTimeout(function(){ic.slides.classList.remove("no-transition"),fc=!0,u("ready",{indexh:Vb,indexv:Wb,currentSlide:Yb})},1)}function e(){ic.theme=document.querySelector("#theme"),ic.wrapper=document.querySelector(".reveal"),ic.slides=document.querySelector(".reveal .slides"),ic.slides.classList.add("no-transition"),ic.background=f(ic.wrapper,"div","backgrounds",null),ic.progress=f(ic.wrapper,"div","progress","<span></span>"),ic.progressbar=ic.progress.querySelector("span"),f(ic.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),ic.slideNumber=f(ic.wrapper,"div","slide-number",""),f(ic.wrapper,"div","state-background",null),f(ic.wrapper,"div","pause-overlay",null),ic.controls=document.querySelector(".reveal .controls"),ic.controlsLeft=l(document.querySelectorAll(".navigate-left")),ic.controlsRight=l(document.querySelectorAll(".navigate-right")),ic.controlsUp=l(document.querySelectorAll(".navigate-up")),ic.controlsDown=l(document.querySelectorAll(".navigate-down")),ic.controlsPrev=l(document.querySelectorAll(".navigate-prev")),ic.controlsNext=l(document.querySelectorAll(".navigate-next"))}function f(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 g(){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"),ic.background.innerHTML="",ic.background.classList.add("no-transition"),l(document.querySelectorAll(bc)).forEach(function(b){var c;c=r()?a(b,b):a(b,ic.background),l(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})}),ec.parallaxBackgroundImage?(ic.background.style.backgroundImage='url("'+ec.parallaxBackgroundImage+'")',ic.background.style.backgroundSize=ec.parallaxBackgroundSize,setTimeout(function(){ic.wrapper.classList.add("has-parallax-background")},1)):(ic.background.style.backgroundImage="",ic.wrapper.classList.remove("has-parallax-background"))}function h(a){var b=document.querySelectorAll(ac).length;if(ic.wrapper.classList.remove(ec.transition),"object"==typeof a&&k(ec,a),jc.trLine truncated
|
||||
},Ub.prototype.on=function(a,b){this.canvas.addEventListener(a,b,!1)},Ub.prototype.off=function(a,b){this.canvas.removeEventListener(a,b,!1)},Ub.prototype.destroy=function(){this.playing=!1,this.canvas.parentNode&&this.container.removeChild(this.canvas)},{initialize:a,configure:h,sync:S,slide:R,left:sb,right:tb,up:ub,down:vb,prev:wb,next:xb,navigateFragment:lb,prevFragment:nb,nextFragment:mb,navigateTo:R,navigateLeft:sb,navigateRight:tb,navigateUp:ub,navigateDown:vb,navigatePrev:wb,navigateNext:xb,layout:B,availableRoutes:ab,availableFragments:bb,toggleOverview:H,togglePause:N,toggleAutoSlide:P,isOverview:I,isPaused:O,isAutoSliding:Q,addEventListeners:i,removeEventListeners:j,getState:ib,setState:jb,getIndices:hb,getSlide:function(a,b){var c=document.querySelectorAll(bc)[a],d=c&&c.querySelectorAll("section");return"undefined"!=typeof b?d?d[b]:void 0:c},getPreviousSlide:function(){return Xb},getCurrentSlide:function(){return Yb},getScale:function(){return hc},getConfig:function(){return ec},getQueryHash:function(){var a={};location.search.replace(/[A-Z0-9]+?=([\w\.%-]*)/gi,function(b){a[b.split("=").shift()]=b.split("=").pop()});for(var b in a){var c=a[b];a[b]=m(unescape(c))}return a},isFirstSlide:function(){return null==document.querySelector(ac+".past")?!0:!1},isLastSlide:function(){return Yb?Yb.nextElementSibling?!1:J(Yb)&&Yb.parentNode.nextElementSibling?!1:!0:!1},isReady:function(){return fc},addEventListener:function(a,b,c){"addEventListener"in window&&(ic.wrapper||document.querySelector(".reveal")).addEventListener(a,b,c)},removeEventListener:function(a,b,c){"addEventListener"in window&&(ic.wrapper||document.querySelector(".reveal")).removeEventListener(a,b,c)}}}();
|
||||
var Reveal=function(){"use strict";function a(a){if(b(),!kc.transforms2d&&!kc.transforms3d)return document.body.setAttribute("class","no-transforms"),void 0;window.addEventListener("load",B,!1);var d=Reveal.getQueryHash();"undefined"!=typeof d.dependencies&&delete d.dependencies,k(fc,a),k(fc,d),s(),c()}function b(){kc.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,kc.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,kc.requestAnimationFrameMethod=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame,kc.requestAnimationFrame="function"==typeof kc.requestAnimationFrameMethod,kc.canvas=!!document.createElement("canvas").getContext,_b=navigator.userAgent.match(/(iphone|ipod|android)/gi)}function c(){function a(){e.length&&head.js.apply(null,e),d()}function b(b){head.ready(b.src.match(/([\w\d_\-]*)\.?js$|[^\\\/]*$/i)[0],function(){"function"==typeof b.callback&&b.callback.apply(this),0===--f&&a()})}for(var c=[],e=[],f=0,g=0,h=fc.dependencies.length;h>g;g++){var i=fc.dependencies[g];(!i.condition||i.condition())&&(i.async?e.push(i.src):c.push(i.src),b(i))}c.length?(f=c.length,head.js.apply(null,c)):a()}function d(){e(),T(),h(),gb(),$(!0),setTimeout(function(){jc.slides.classList.remove("no-transition"),gc=!0,u("ready",{indexh:Wb,indexv:Xb,currentSlide:Zb})},1)}function e(){jc.theme=document.querySelector("#theme"),jc.wrapper=document.querySelector(".reveal"),jc.slides=document.querySelector(".reveal .slides"),jc.slides.classList.add("no-transition"),jc.background=f(jc.wrapper,"div","backgrounds",null),jc.progress=f(jc.wrapper,"div","progress","<span></span>"),jc.progressbar=jc.progress.querySelector("span"),f(jc.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),jc.slideNumber=f(jc.wrapper,"div","slide-number",""),f(jc.wrapper,"div","state-background",null),f(jc.wrapper,"div","pause-overlay",null),jc.controls=document.querySelector(".reveal .controls"),jc.controlsLeft=l(document.querySelectorAll(".navigate-left")),jc.controlsRight=l(document.querySelectorAll(".navigate-right")),jc.controlsUp=l(document.querySelectorAll(".navigate-up")),jc.controlsDown=l(document.querySelectorAll(".navigate-down")),jc.controlsPrev=l(document.querySelectorAll(".navigate-prev")),jc.controlsNext=l(document.querySelectorAll(".navigate-next"))}function f(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 g(){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"),jc.background.innerHTML="",jc.background.classList.add("no-transition"),l(document.querySelectorAll(cc)).forEach(function(b){var c;c=r()?a(b,b):a(b,jc.background),l(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})}),fc.parallaxBackgroundImage?(jc.background.style.backgroundImage='url("'+fc.parallaxBackgroundImage+'")',jc.background.style.backgroundSize=fc.parallaxBackgroundSize,setTimeout(function(){jc.wrapper.classList.add("has-parallax-background")},1)):(jc.background.style.backgroundImage="",jc.wrapper.classList.remove("has-parallax-background"))}function h(a){var b=document.querySelectorAll(bc).length;if(jc.wrapper.classList.remove(fc.transition),"object"==typeof a&&k(fc,a),kc.trLine truncated
|
||||
},Vb.prototype.on=function(a,b){this.canvas.addEventListener(a,b,!1)},Vb.prototype.off=function(a,b){this.canvas.removeEventListener(a,b,!1)},Vb.prototype.destroy=function(){this.playing=!1,this.canvas.parentNode&&this.container.removeChild(this.canvas)},{initialize:a,configure:h,sync:S,slide:R,left:tb,right:ub,up:vb,down:wb,prev:xb,next:yb,navigateFragment:mb,prevFragment:ob,nextFragment:nb,navigateTo:R,navigateLeft:tb,navigateRight:ub,navigateUp:vb,navigateDown:wb,navigatePrev:xb,navigateNext:yb,layout:B,availableRoutes:ab,availableFragments:bb,toggleOverview:H,togglePause:N,toggleAutoSlide:P,isOverview:I,isPaused:O,isAutoSliding:Q,addEventListeners:i,removeEventListeners:j,getState:jb,setState:kb,getProgress:eb,getIndices:ib,getSlide:function(a,b){var c=document.querySelectorAll(cc)[a],d=c&&c.querySelectorAll("section");return"undefined"!=typeof b?d?d[b]:void 0:c},getPreviousSlide:function(){return Yb},getCurrentSlide:function(){return Zb},getScale:function(){return ic},getConfig:function(){return fc},getQueryHash:function(){var a={};location.search.replace(/[A-Z0-9]+?=([\w\.%-]*)/gi,function(b){a[b.split("=").shift()]=b.split("=").pop()});for(var b in a){var c=a[b];a[b]=m(unescape(c))}return a},isFirstSlide:function(){return null==document.querySelector(bc+".past")?!0:!1},isLastSlide:function(){return Zb?Zb.nextElementSibling?!1:J(Zb)&&Zb.parentNode.nextElementSibling?!1:!0:!1},isReady:function(){return gc},addEventListener:function(a,b,c){"addEventListener"in window&&(jc.wrapper||document.querySelector(".reveal")).addEventListener(a,b,c)},removeEventListener:function(a,b,c){"addEventListener"in window&&(jc.wrapper||document.querySelector(".reveal")).removeEventListener(a,b,c)}}}();
|
||||
Reference in new issue
Block a user