group feature detection results in 'features' object, test for canvas and requestAnimationFrame

This commit is contained in:
Hakim El Hattab committed 2013-10-13 13:08:50 -04:00
1 parent 9fa1382508
commit 356a1cf3b7
2 files changed
+14 -13

No files matched your search

+12 -11
View File
@@ -136,11 +136,8 @@ var Reveal = (function(){
// Cached references to DOM elements
dom = {},
// Client support for CSS 3D transforms, see #checkCapabilities()
supports3DTransforms,
// Client support for CSS 2D transforms, see #checkCapabilities()
supports2DTransforms,
// Features supported by the browser, see #checkCapabilities()
features = {},
// Client is a mobile device, see #checkCapabilities()
isMobileDevice,
@@ -183,7 +180,7 @@ var Reveal = (function(){
checkCapabilities();
if( !supports2DTransforms && !supports3DTransforms ) {
if( !features.transforms2d && !features.transforms3d ) {
document.body.setAttribute( 'class', 'no-transforms' );
// If the browser doesn't support core features we won't be
@@ -212,18 +209,22 @@ var Reveal = (function(){
*/
function checkCapabilities() {
supports3DTransforms = 'WebkitPerspective' in document.body.style ||
features.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;
supports2DTransforms = 'WebkitTransform' in document.body.style ||
features.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;
features.requestAnimationFrame = typeof window.requestAnimationFrame === 'function';
features.canvas = !!document.createElement( 'canvas' ).getContext;
isMobileDevice = navigator.userAgent.match( /(iphone|ipod|android)/gi );
}
@@ -523,7 +524,7 @@ var Reveal = (function(){
if( typeof options === 'object' ) extend( config, options );
// Force linear transition based on browser capabilities
if( supports3DTransforms === false ) config.transition = 'linear';
if( features.transforms3d === false ) config.transition = 'linear';
dom.wrapper.classList.add( config.transition );
@@ -886,7 +887,7 @@ var Reveal = (function(){
*/
function enableRollingLinks() {
if( supports3DTransforms && !( 'msPerspective' in document.body.style ) ) {
if( features.transforms3d && !( 'msPerspective' in document.body.style ) ) {
var anchors = document.querySelectorAll( SLIDES_SELECTOR + ' a:not(.image)' );
for( var i = 0, len = anchors.length; i < len; i++ ) {
@@ -2472,7 +2473,7 @@ var Reveal = (function(){
event.preventDefault();
}
// ESC or O key
else if ( ( event.keyCode === 27 || event.keyCode === 79 ) && supports3DTransforms ) {
else if ( ( event.keyCode === 27 || event.keyCode === 79 ) && features.transforms3d ) {
if( dom.preview ) {
closePreview();
}
+2 -2
View File
@@ -1,8 +1,8 @@
/*!
* reveal.js 2.6.0-dev (2013-10-13, 13:02)
* reveal.js 2.6.0-dev (2013-10-13, 13:08)
* 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){return b(),Ob||Nb?(window.addEventListener("load",C,!1),l(Vb,a),l(Vb,Reveal.getQueryHash()),s(),c(),void 0):(document.body.setAttribute("class","no-transforms"),void 0)}function b(){Nb="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,Ob="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,Pb=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=Vb.dependencies.length;f>e;e++){var g=Vb.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(),ab(),setTimeout(function(){$b.slides.classList.remove("no-transition"),Wb=!0,u("ready",{indexh:Jb,indexv:Kb,currentSlide:Mb})},1)}function e(){var a=m(document.querySelectorAll(Sb));a.forEach(function(a){var b=m(a.querySelectorAll("section"));b.forEach(function(a,b){b>0&&a.classList.add("future")})})}function f(){$b.theme=document.querySelector("#theme"),$b.wrapper=document.querySelector(".reveal"),$b.slides=document.querySelector(".reveal .slides"),$b.slides.classList.add("no-transition"),$b.background=g($b.wrapper,"div","backgrounds",null),$b.progress=g($b.wrapper,"div","progress","<span></span>"),$b.progressbar=$b.progress.querySelector("span"),g($b.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),g($b.wrapper,"div","state-background",null),g($b.wrapper,"div","pause-overlay",null),$b.controls=document.querySelector(".reveal .controls"),$b.controlsLeft=m(document.querySelectorAll(".navigate-left")),$b.controlsRight=m(document.querySelectorAll(".navigate-right")),$b.controlsUp=m(document.querySelectorAll(".navigate-up")),$b.controlsDown=m(document.querySelectorAll(".navigate-down")),$b.controlsPrev=m(document.querySelectorAll(".navigate-prev")),$b.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.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"),$b.background.innerHTML="",$b.background.classList.add("no-transition"),m(document.querySelectorAll(Sb)).forEach(function(b){var c;c=r()?a(b,b):a(b,$b.background),m(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})}),Vb.parallaxBackgroundImage?($b.background.style.backgroundImage='url("'+Vb.parallaxBackgroundImage+'")',$b.background.style.backgroundSize=Vb.parallaxBackgroundSize,setTimeout(function(){$b.wrapper.classList.add("has-parallax-background")},1)):($b.background.style.backgroundImage="",$b.wrapper.classList.remove("has-parallax-background"))}function i(a){if($b.wrapper.classList.remove(Vb.transition),"object"==typeof a&&l(Vb,a),Nb===!1&&(Vb.transition="linear"),$b.wrapper.classList.add(Vb.transition),$b.wrapper.setAttribute("data-transition-speed",Vb.transitionSpeed),$b.wrapper.setAttribute("data-background-transition",Vb.backgroundTransition),$b.controls.style.display=Vb.controls?"block":"none",$b.progress.style.display=Vb.progress?"block":"none",Vb.rtl?$b.wrapper.classList.add("rtl"):$b.wrapper.classList.remove("rtl"),Vb.center?$b.wrapper.classList.add("center"):$b.wrapper.classList.remove("center"),Vb.mouseWheel?(document.addEventListener("DOMMouseScroll",vb,!1),document.addEventListener("mousewheel"Line truncated
var Reveal=function(){"use strict";function a(a){return b(),Zb.transforms2d||Zb.transforms3d?(window.addEventListener("load",C,!1),l(Tb,a),l(Tb,Reveal.getQueryHash()),s(),c(),void 0):(document.body.setAttribute("class","no-transforms"),void 0)}function b(){Zb.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,Zb.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,Zb.requestAnimationFrame="function"==typeof window.requestAnimationFrame,Zb.canvas=!!document.createElement("canvas").getContext,Nb=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=Tb.dependencies.length;f>e;e++){var g=Tb.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(),ab(),setTimeout(function(){Yb.slides.classList.remove("no-transition"),Ub=!0,u("ready",{indexh:Jb,indexv:Kb,currentSlide:Mb})},1)}function e(){var a=m(document.querySelectorAll(Qb));a.forEach(function(a){var b=m(a.querySelectorAll("section"));b.forEach(function(a,b){b>0&&a.classList.add("future")})})}function f(){Yb.theme=document.querySelector("#theme"),Yb.wrapper=document.querySelector(".reveal"),Yb.slides=document.querySelector(".reveal .slides"),Yb.slides.classList.add("no-transition"),Yb.background=g(Yb.wrapper,"div","backgrounds",null),Yb.progress=g(Yb.wrapper,"div","progress","<span></span>"),Yb.progressbar=Yb.progress.querySelector("span"),g(Yb.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),g(Yb.wrapper,"div","state-background",null),g(Yb.wrapper,"div","pause-overlay",null),Yb.controls=document.querySelector(".reveal .controls"),Yb.controlsLeft=m(document.querySelectorAll(".navigate-left")),Yb.controlsRight=m(document.querySelectorAll(".navigate-right")),Yb.controlsUp=m(document.querySelectorAll(".navigate-up")),Yb.controlsDown=m(document.querySelectorAll(".navigate-down")),Yb.controlsPrev=m(document.querySelectorAll(".navigate-prev")),Yb.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.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"),Yb.background.innerHTML="",Yb.background.classList.add("no-transition"),m(document.querySelectorAll(Qb)).forEach(function(b){var c;c=r()?a(b,b):a(b,Yb.background),m(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})}),Tb.parallaxBackgroundImage?(Yb.background.style.backgroundImage='url("'+Tb.parallaxBackgroundImage+'")',Yb.background.style.backgroundSize=Tb.parallaxBackgroundSize,setTimeout(function(){Yb.wrapper.classList.add("has-parallax-background")},1)):(Yb.background.style.backgroundImage="",Yb.wrapper.classList.remove("has-parallax-background"))}function i(a){if(Yb.wrapper.classList.remove(Tb.transition),"object"==typeof a&&l(Tb,a),Zb.transforms3d===!1&&(Tb.transition="linear"),Yb.wrapper.classList.add(Tb.transition),Yb.wrapper.setAttribute("data-transition-speed",Tb.transitionSpeed),Yb.wrapper.setAttribute("data-background-transition",Tb.backgroundTransition),Yb.controls.style.display=Tb.controls?"block":"none",Yb.progress.style.display=Tb.progress?"block":"none",Tb.rtl?Yb.wrapper.classList.add("rtl"):Yb.wrapper.classList.removeLine truncated