initial fragment rewrite
This commit is contained in:
1 parent
e0dccd85be
commit
b4e2c97d0c
2 files changed
+80
-50
No files matched your search
+77
-47
@@ -1047,7 +1047,7 @@ var Reveal = (function(){
|
||||
|
||||
a.forEach( function( el, idx ) {
|
||||
if( !el.hasAttribute( 'data-fragment-index' ) ) {
|
||||
el.setAttribute( 'data-fragment-index', idx );
|
||||
el.setAttribute( 'data-fragment-index', idx + 1 );
|
||||
}
|
||||
} );
|
||||
|
||||
@@ -2278,6 +2278,79 @@ var Reveal = (function(){
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Navigate to the specified slide fragment.
|
||||
*
|
||||
* @return {Boolean} true if there was a next fragment,
|
||||
* false otherwise
|
||||
*/
|
||||
function navigateFragment( index, offset ) {
|
||||
|
||||
if( currentSlide && config.fragments ) {
|
||||
|
||||
var fragments = sortFragments( currentSlide.querySelectorAll( '.fragment' ) );
|
||||
if( fragments.length ) {
|
||||
|
||||
if( typeof index !== 'number' ) {
|
||||
var lastVisibleFragment = sortFragments( currentSlide.querySelectorAll( '.fragment.visible' ) ).pop();
|
||||
|
||||
if( lastVisibleFragment ) {
|
||||
index = parseInt( lastVisibleFragment.getAttribute( 'data-fragment-index' ) || 1, 10 );
|
||||
}
|
||||
else {
|
||||
index = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if( typeof offset === 'number' ) {
|
||||
index += offset;
|
||||
}
|
||||
|
||||
var fragmentsShown = [],
|
||||
fragmentsHidden = [];
|
||||
|
||||
toArray( fragments ).forEach( function( element, i ) {
|
||||
|
||||
if( i < index ) {
|
||||
if( !element.classList.contains( 'visible' ) ) fragmentsShown.push( element );
|
||||
element.classList.add( 'visible' );
|
||||
element.classList.remove( 'current-fragment' );
|
||||
|
||||
if( i === index ) {
|
||||
element.classList.add( 'current-fragment' );
|
||||
}
|
||||
}
|
||||
else {
|
||||
if( element.classList.contains( 'visible' ) ) fragmentsHidden.push( element );
|
||||
element.classList.remove( 'visible' );
|
||||
element.classList.remove( 'current-fragment' );
|
||||
}
|
||||
|
||||
|
||||
} );
|
||||
|
||||
if( offset < 0 && fragmentsHidden.length ) {
|
||||
console.log('hidden');
|
||||
dispatchEvent( 'fragmenthidden', { fragment: fragmentsHidden[0], fragments: fragmentsHidden } );
|
||||
}
|
||||
|
||||
if( offset > 0 && fragmentsShown.length ) {
|
||||
console.log('hidden');
|
||||
dispatchEvent( 'fragmentshown', { fragment: fragmentsShown[0], fragments: fragmentsShown } );
|
||||
}
|
||||
|
||||
updateControls();
|
||||
|
||||
return !!( fragmentsShown.length || fragmentsHidden.length );
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Navigate to the next slide fragment.
|
||||
*
|
||||
@@ -2286,29 +2359,7 @@ var Reveal = (function(){
|
||||
*/
|
||||
function nextFragment() {
|
||||
|
||||
if( currentSlide && config.fragments ) {
|
||||
var fragments = sortFragments( currentSlide.querySelectorAll( '.fragment:not(.visible)' ) );
|
||||
|
||||
if( fragments.length ) {
|
||||
// Find the index of the next fragment
|
||||
var index = fragments[0].getAttribute( 'data-fragment-index' );
|
||||
|
||||
// Find all fragments with the same index
|
||||
fragments = currentSlide.querySelectorAll( '.fragment[data-fragment-index="'+ index +'"]' );
|
||||
|
||||
toArray( fragments ).forEach( function( element ) {
|
||||
element.classList.add( 'visible' );
|
||||
} );
|
||||
|
||||
// Notify subscribers of the change
|
||||
dispatchEvent( 'fragmentshown', { fragment: fragments[0], fragments: fragments } );
|
||||
|
||||
updateControls();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
return navigateFragment( null, 1 );
|
||||
|
||||
}
|
||||
|
||||
@@ -2320,29 +2371,7 @@ var Reveal = (function(){
|
||||
*/
|
||||
function previousFragment() {
|
||||
|
||||
if( currentSlide && config.fragments ) {
|
||||
var fragments = sortFragments( currentSlide.querySelectorAll( '.fragment.visible' ) );
|
||||
|
||||
if( fragments.length ) {
|
||||
// Find the index of the previous fragment
|
||||
var index = fragments[ fragments.length - 1 ].getAttribute( 'data-fragment-index' );
|
||||
|
||||
// Find all fragments with the same index
|
||||
fragments = currentSlide.querySelectorAll( '.fragment[data-fragment-index="'+ index +'"]' );
|
||||
|
||||
toArray( fragments ).forEach( function( f ) {
|
||||
f.classList.remove( 'visible' );
|
||||
} );
|
||||
|
||||
// Notify subscribers of the change
|
||||
dispatchEvent( 'fragmenthidden', { fragment: fragments[0], fragments: fragments } );
|
||||
|
||||
updateControls();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
return navigateFragment( null, -1 );
|
||||
|
||||
}
|
||||
|
||||
@@ -3132,6 +3161,7 @@ var Reveal = (function(){
|
||||
next: navigateNext,
|
||||
prevFragment: previousFragment,
|
||||
nextFragment: nextFragment,
|
||||
navigateFragment: navigateFragment,
|
||||
|
||||
// Deprecated aliases
|
||||
navigateTo: slide,
|
||||
|
||||
Vendored
+3
-3
@@ -1,9 +1,9 @@
|
||||
/*!
|
||||
* reveal.js 2.6.0-dev (2013-11-17, 17:12)
|
||||
* reveal.js 2.6.0-dev (2013-11-18, 08:59)
|
||||
* 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(),!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>'),bc.slideNumber=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"))}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-parallax-background"))}function i(a){var b=dLine truncated
|
||||
},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)}}}();
|
||||
var Reveal=function(){"use strict";function a(a){if(b(),!dc.transforms2d&&!dc.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($b,a),l($b,d),s(),c()}function b(){dc.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,dc.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,dc.requestAnimationFrameMethod=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame,dc.requestAnimationFrame="function"==typeof dc.requestAnimationFrameMethod,dc.canvas=!!document.createElement("canvas").getContext,Ub=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=$b.dependencies.length;f>e;e++){var g=$b.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(){cc.slides.classList.remove("no-transition"),_b=!0,u("ready",{indexh:Pb,indexv:Qb,currentSlide:Sb})},1)}function e(){var a=m(document.querySelectorAll(Xb));a.forEach(function(a){var b=m(a.querySelectorAll("section"));b.forEach(function(a,b){b>0&&a.classList.add("future")})})}function f(){cc.theme=document.querySelector("#theme"),cc.wrapper=document.querySelector(".reveal"),cc.slides=document.querySelector(".reveal .slides"),cc.slides.classList.add("no-transition"),cc.background=g(cc.wrapper,"div","backgrounds",null),cc.progress=g(cc.wrapper,"div","progress","<span></span>"),cc.progressbar=cc.progress.querySelector("span"),g(cc.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),cc.slideNumber=g(cc.wrapper,"div","slide-number",""),g(cc.wrapper,"div","state-background",null),g(cc.wrapper,"div","pause-overlay",null),cc.controls=document.querySelector(".reveal .controls"),cc.controlsLeft=m(document.querySelectorAll(".navigate-left")),cc.controlsRight=m(document.querySelectorAll(".navigate-right")),cc.controlsUp=m(document.querySelectorAll(".navigate-up")),cc.controlsDown=m(document.querySelectorAll(".navigate-down")),cc.controlsPrev=m(document.querySelectorAll(".navigate-prev")),cc.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"),cc.background.innerHTML="",cc.background.classList.add("no-transition"),m(document.querySelectorAll(Xb)).forEach(function(b){var c;c=r()?a(b,b):a(b,cc.background),m(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})}),$b.parallaxBackgroundImage?(cc.background.style.backgroundImage='url("'+$b.parallaxBackgroundImage+'")',cc.background.style.backgroundSize=$b.parallaxBackgroundSize,setTimeout(function(){cc.wrapper.classList.add("has-parallax-background")},1)):(cc.background.style.backgroundImage="",cc.wrapper.classList.remove("has-parallax-background"))}function i(a){var b=dLine truncated
|
||||
}return a},isFirstSlide:function(){return null==document.querySelector(Wb+".past")?!0:!1},isLastSlide:function(){return Sb?Sb.nextElementSibling?!1:K(Sb)&&Sb.parentNode.nextElementSibling?!1:!0:!1},isReady:function(){return _b},addEventListener:function(a,b,c){"addEventListener"in window&&(cc.wrapper||document.querySelector(".reveal")).addEventListener(a,b,c)},removeEventListener:function(a,b,c){"addEventListener"in window&&(cc.wrapper||document.querySelector(".reveal")).removeEventListener(a,b,c)}}}();
|
||||
Reference in new issue
Block a user