optimization, only declare background creation method once
This commit is contained in:
Hakim El Hattab committed
1 parent
17d8f0b77c
commit
ccbeaf4c32
2 files changed
+61
-56
No files matched your search
+58
-53
@@ -425,9 +425,64 @@ var Reveal = (function(){
|
||||
dom.background.innerHTML = '';
|
||||
dom.background.classList.add( 'no-transition' );
|
||||
|
||||
// Helper method for creating a background element for the
|
||||
// given slide
|
||||
function _createBackground( slide, container ) {
|
||||
// Iterate over all horizontal slides
|
||||
toArray( document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ) ).forEach( function( slideh ) {
|
||||
|
||||
var backgroundStack;
|
||||
|
||||
if( isPrintingPDF() ) {
|
||||
backgroundStack = createBackground( slideh, slideh );
|
||||
}
|
||||
else {
|
||||
backgroundStack = createBackground( slideh, dom.background );
|
||||
}
|
||||
|
||||
// Iterate over all vertical slides
|
||||
toArray( slideh.querySelectorAll( 'section' ) ).forEach( function( slidev ) {
|
||||
|
||||
if( isPrintingPDF() ) {
|
||||
createBackground( slidev, slidev );
|
||||
}
|
||||
else {
|
||||
createBackground( slidev, backgroundStack );
|
||||
}
|
||||
|
||||
} );
|
||||
|
||||
} );
|
||||
|
||||
// Add parallax background if specified
|
||||
if( config.parallaxBackgroundImage ) {
|
||||
|
||||
dom.background.style.backgroundImage = 'url("' + config.parallaxBackgroundImage + '")';
|
||||
dom.background.style.backgroundSize = config.parallaxBackgroundSize;
|
||||
|
||||
// Make sure the below properties are set on the element - these properties are
|
||||
// needed for proper transitions to be set on the element via CSS. To remove
|
||||
// annoying background slide-in effect when the presentation starts, apply
|
||||
// these properties after short time delay
|
||||
setTimeout( function() {
|
||||
dom.wrapper.classList.add( 'has-parallax-background' );
|
||||
}, 1 );
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
dom.background.style.backgroundImage = '';
|
||||
dom.wrapper.classList.remove( 'has-parallax-background' );
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a background for the given slide.
|
||||
*
|
||||
* @param {HTMLElement} slide
|
||||
* @param {HTMLElement} container The element that the background
|
||||
* should be appended to
|
||||
*/
|
||||
function createBackground( slide, container ) {
|
||||
|
||||
var data = {
|
||||
background: slide.getAttribute( 'data-background' ),
|
||||
@@ -470,56 +525,6 @@ var Reveal = (function(){
|
||||
|
||||
}
|
||||
|
||||
// Iterate over all horizontal slides
|
||||
toArray( document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ) ).forEach( function( slideh ) {
|
||||
|
||||
var backgroundStack;
|
||||
|
||||
if( isPrintingPDF() ) {
|
||||
backgroundStack = _createBackground( slideh, slideh );
|
||||
}
|
||||
else {
|
||||
backgroundStack = _createBackground( slideh, dom.background );
|
||||
}
|
||||
|
||||
// Iterate over all vertical slides
|
||||
toArray( slideh.querySelectorAll( 'section' ) ).forEach( function( slidev ) {
|
||||
|
||||
if( isPrintingPDF() ) {
|
||||
_createBackground( slidev, slidev );
|
||||
}
|
||||
else {
|
||||
_createBackground( slidev, backgroundStack );
|
||||
}
|
||||
|
||||
} );
|
||||
|
||||
} );
|
||||
|
||||
// Add parallax background if specified
|
||||
if( config.parallaxBackgroundImage ) {
|
||||
|
||||
dom.background.style.backgroundImage = 'url("' + config.parallaxBackgroundImage + '")';
|
||||
dom.background.style.backgroundSize = config.parallaxBackgroundSize;
|
||||
|
||||
// Make sure the below properties are set on the element - these properties are
|
||||
// needed for proper transitions to be set on the element via CSS. To remove
|
||||
// annoying background slide-in effect when the presentation starts, apply
|
||||
// these properties after short time delay
|
||||
setTimeout( function() {
|
||||
dom.wrapper.classList.add( 'has-parallax-background' );
|
||||
}, 1 );
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
dom.background.style.backgroundImage = '';
|
||||
dom.wrapper.classList.remove( 'has-parallax-background' );
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Applies the configuration settings from the config
|
||||
* object. May be called multiple times.
|
||||
|
||||
Vendored
+3
-3
@@ -1,9 +1,9 @@
|
||||
/*!
|
||||
* reveal.js 2.7.0-dev (2014-03-25, 21:37)
|
||||
* reveal.js 2.7.0-dev (2014-03-26, 15:19)
|
||||
* 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(),!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)}}}();
|
||||
var Reveal=function(){"use strict";function a(a){if(b(),!lc.transforms2d&&!lc.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(gc,a),l(gc,d),t(),c()}function b(){lc.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,lc.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,lc.requestAnimationFrameMethod=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame,lc.requestAnimationFrame="function"==typeof lc.requestAnimationFrameMethod,lc.canvas=!!document.createElement("canvas").getContext,ac=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=gc.dependencies.length;h>g;g++){var i=gc.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(),U(),i(),hb(),_(!0),setTimeout(function(){kc.slides.classList.remove("no-transition"),hc=!0,v("ready",{indexh:Xb,indexv:Yb,currentSlide:$b})},1)}function e(){kc.theme=document.querySelector("#theme"),kc.wrapper=document.querySelector(".reveal"),kc.slides=document.querySelector(".reveal .slides"),kc.slides.classList.add("no-transition"),kc.background=f(kc.wrapper,"div","backgrounds",null),kc.progress=f(kc.wrapper,"div","progress","<span></span>"),kc.progressbar=kc.progress.querySelector("span"),f(kc.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),kc.slideNumber=f(kc.wrapper,"div","slide-number",""),f(kc.wrapper,"div","state-background",null),f(kc.wrapper,"div","pause-overlay",null),kc.controls=document.querySelector(".reveal .controls"),kc.controlsLeft=m(document.querySelectorAll(".navigate-left")),kc.controlsRight=m(document.querySelectorAll(".navigate-right")),kc.controlsUp=m(document.querySelectorAll(".navigate-up")),kc.controlsDown=m(document.querySelectorAll(".navigate-down")),kc.controlsPrev=m(document.querySelectorAll(".navigate-prev")),kc.controlsNext=m(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(){s()&&document.body.classList.add("print-pdf"),kc.background.innerHTML="",kc.background.classList.add("no-transition"),m(document.querySelectorAll(dc)).forEach(function(a){var b;b=s()?h(a,a):h(a,kc.background),m(a.querySelectorAll("section")).forEach(function(a){s()?h(a,a):h(a,b)})}),gc.parallaxBackgroundImage?(kc.background.style.backgroundImage='url("'+gc.parallaxBackgroundImage+'")',kc.background.style.backgroundSize=gc.parallaxBackgroundSize,setTimeout(function(){kc.wrapper.classList.add("has-parallax-background")},1)):(kc.background.style.backgroundImage="",kc.wrapper.classList.remove("has-parallax-background"))}function h(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}function i(a){var b=document.querySelectorAll(cc).length;if(kc.wrapper.classList.remove(gc.transition),"object"==typeof a&&l(gc,a),lc.trLine truncated
|
||||
},Wb.prototype.on=function(a,b){this.canvas.addEventListener(a,b,!1)},Wb.prototype.off=function(a,b){this.canvas.removeEventListener(a,b,!1)},Wb.prototype.destroy=function(){this.playing=!1,this.canvas.parentNode&&this.container.removeChild(this.canvas)},{initialize:a,configure:i,sync:T,slide:S,left:ub,right:vb,up:wb,down:xb,prev:yb,next:zb,navigateFragment:nb,prevFragment:pb,nextFragment:ob,navigateTo:S,navigateLeft:ub,navigateRight:vb,navigateUp:wb,navigateDown:xb,navigatePrev:yb,navigateNext:zb,layout:C,availableRoutes:bb,availableFragments:cb,toggleOverview:I,togglePause:O,toggleAutoSlide:Q,isOverview:J,isPaused:P,isAutoSliding:R,addEventListeners:j,removeEventListeners:k,getState:kb,setState:lb,getProgress:fb,getIndices:jb,getSlide:function(a,b){var c=document.querySelectorAll(dc)[a],d=c&&c.querySelectorAll("section");return"undefined"!=typeof b?d?d[b]:void 0:c},getPreviousSlide:function(){return Zb},getCurrentSlide:function(){return $b},getScale:function(){return jc},getConfig:function(){return gc},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]=n(unescape(c))}return a},isFirstSlide:function(){return null==document.querySelector(cc+".past")?!0:!1},isLastSlide:function(){return $b?$b.nextElementSibling?!1:K($b)&&$b.parentNode.nextElementSibling?!1:!0:!1},isReady:function(){return hc},addEventListener:function(a,b,c){"addEventListener"in window&&(kc.wrapper||document.querySelector(".reveal")).addEventListener(a,b,c)},removeEventListener:function(a,b,c){"addEventListener"in window&&(kc.wrapper||document.querySelector(".reveal")).removeEventListener(a,b,c)}}}();
|
||||
Reference in new issue
Block a user