merge slide numbers, adjust code format
This commit is contained in:
commit
bdb46060b3
12 files changed
+105
-5
No files matched your search
+29
-1
@@ -108,7 +108,10 @@ var Reveal = (function(){
|
||||
viewDistance: 3,
|
||||
|
||||
// Script dependencies to load
|
||||
dependencies: []
|
||||
dependencies: [],
|
||||
|
||||
// Indicates whether to show the slides number
|
||||
showSlideNumber: false
|
||||
},
|
||||
|
||||
// Flags if reveal.js is loaded (has dispatched the 'ready' event)
|
||||
@@ -378,6 +381,9 @@ var Reveal = (function(){
|
||||
'<div class="navigate-up"></div>' +
|
||||
'<div class="navigate-down"></div>' );
|
||||
|
||||
// slide number
|
||||
createSingletonNode( dom.wrapper, 'div', 'slide-number', '' );
|
||||
|
||||
// State background element [DEPRECATED]
|
||||
createSingletonNode( dom.wrapper, 'div', 'state-background', null );
|
||||
|
||||
@@ -395,6 +401,7 @@ var Reveal = (function(){
|
||||
dom.controlsPrev = toArray( document.querySelectorAll( '.navigate-prev' ) );
|
||||
dom.controlsNext = toArray( document.querySelectorAll( '.navigate-next' ) );
|
||||
|
||||
dom.slideNumber = document.querySelector( '.slide-number' );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1613,6 +1620,7 @@ var Reveal = (function(){
|
||||
updateProgress();
|
||||
updateBackground();
|
||||
updateParallax();
|
||||
updateSlideNumber();
|
||||
|
||||
// Update the URL hash
|
||||
writeURL();
|
||||
@@ -1647,6 +1655,7 @@ var Reveal = (function(){
|
||||
updateControls();
|
||||
updateProgress();
|
||||
updateBackground( true );
|
||||
updateSlideNumber();
|
||||
|
||||
}
|
||||
|
||||
@@ -1851,6 +1860,25 @@ var Reveal = (function(){
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the slide number div to reflect the current slide.
|
||||
*/
|
||||
function updateSlideNumber() {
|
||||
|
||||
// Update slide number if enabled
|
||||
if( config.showSlideNumber && dom.slideNumber) {
|
||||
|
||||
// Display the number of the page using 'indexh - indexv' format
|
||||
var indexString = indexh;
|
||||
if( indexv > 0 ) {
|
||||
indexString += ' - ' + indexv;
|
||||
}
|
||||
|
||||
dom.slideNumber.innerHTML = indexString;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the state of all control/navigation arrows.
|
||||
*/
|
||||
|
||||
Vendored
+3
-3
@@ -1,9 +1,9 @@
|
||||
/*!
|
||||
* reveal.js 2.6.0-dev (2013-11-09, 11:40)
|
||||
* reveal.js 2.6.0-dev (2013-11-17, 17:04)
|
||||
* http://lab.hakim.se/reveal-js
|
||||
* MIT licensed
|
||||
*
|
||||
* 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
|
||||
},removeEventListener:function(a,b,c){"addEventListener"in window&&(ac.wrapper||document.querySelector(".reveal")).removeEventListener(a,b,c)}}}();
|
||||
var Reveal=function(){"use strict";function a(a){if(b(),!cc.transforms2d&&!cc.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(Zb,a),l(Zb,d),s(),c()}function b(){cc.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,cc.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,cc.requestAnimationFrameMethod=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame,cc.requestAnimationFrame="function"==typeof cc.requestAnimationFrameMethod,cc.canvas=!!document.createElement("canvas").getContext,Tb=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=Zb.dependencies.length;f>e;e++){var g=Zb.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(),cb(),X(!0),setTimeout(function(){bc.slides.classList.remove("no-transition"),$b=!0,u("ready",{indexh:Ob,indexv:Pb,currentSlide:Rb})},1)}function e(){var a=m(document.querySelectorAll(Wb));a.forEach(function(a){var b=m(a.querySelectorAll("section"));b.forEach(function(a,b){b>0&&a.classList.add("future")})})}function f(){bc.theme=document.querySelector("#theme"),bc.wrapper=document.querySelector(".reveal"),bc.slides=document.querySelector(".reveal .slides"),bc.slides.classList.add("no-transition"),bc.background=g(bc.wrapper,"div","backgrounds",null),bc.progress=g(bc.wrapper,"div","progress","<span></span>"),bc.progressbar=bc.progress.querySelector("span"),g(bc.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),g(bc.wrapper,"div","slide-number",""),g(bc.wrapper,"div","state-background",null),g(bc.wrapper,"div","pause-overlay",null),bc.controls=document.querySelector(".reveal .controls"),bc.controlsLeft=m(document.querySelectorAll(".navigate-left")),bc.controlsRight=m(document.querySelectorAll(".navigate-right")),bc.controlsUp=m(document.querySelectorAll(".navigate-up")),bc.controlsDown=m(document.querySelectorAll(".navigate-down")),bc.controlsPrev=m(document.querySelectorAll(".navigate-prev")),bc.controlsNext=m(document.querySelectorAll(".navigate-next")),bc.slideNumber=document.querySelector(".slide-number")}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"),bc.background.innerHTML="",bc.background.classList.add("no-transition"),m(document.querySelectorAll(Wb)).forEach(function(b){var c;c=r()?a(b,b):a(b,bc.background),m(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})}),Zb.parallaxBackgroundImage?(bc.background.style.backgroundImage='url("'+Zb.parallaxBackgroundImage+'")',bc.background.style.backgroundSize=Zb.parallaxBackgroundSize,setTimeout(function(){bc.wrapper.classList.add("has-parallax-background")},1)):(bc.background.style.backgroundImage="",bc.wrapper.classList.remove("has-paraLine truncated
|
||||
},isLastSlide:function(){return Rb?Rb.nextElementSibling?!1:K(Rb)&&Rb.parentNode.nextElementSibling?!1:!0:!1},isReady:function(){return $b},addEventListener:function(a,b,c){"addEventListener"in window&&(bc.wrapper||document.querySelector(".reveal")).addEventListener(a,b,c)},removeEventListener:function(a,b,c){"addEventListener"in window&&(bc.wrapper||document.querySelector(".reveal")).removeEventListener(a,b,c)}}}();
|
||||
Reference in new issue
Block a user