windows.navigator.pointerEnabled
for backward compatibility reasons, IE11 sets both msPointerEnabled and pointerEnabled. Changed the order for the test and added 'else if' to not duplicate handlers on pointer events
This commit is contained in:
1 parent
e608dafaf1
commit
27bf130611
3 files changed
+11
-23
No files matched your search
+8
-8
@@ -595,18 +595,18 @@ var Reveal = (function(){
|
||||
dom.wrapper.addEventListener( 'touchend', onTouchEnd, false );
|
||||
|
||||
// Support pointer-style touch interaction as well
|
||||
// IE 10 uses prefixed version of pointer events
|
||||
if( window.navigator.msPointerEnabled ) {
|
||||
if( window.navigator.pointerEnabled ) {
|
||||
// IE 11 uses un-prefixed version of pointer events
|
||||
dom.wrapper.addEventListener( 'pointerdown', onPointerDown, false );
|
||||
dom.wrapper.addEventListener( 'pointermove', onPointerMove, false );
|
||||
dom.wrapper.addEventListener( 'pointerup', onPointerUp, false );
|
||||
} else if( window.navigator.msPointerEnabled ) {
|
||||
// IE 10 uses prefixed version of pointer events
|
||||
dom.wrapper.addEventListener( 'MSPointerDown', onPointerDown, false );
|
||||
dom.wrapper.addEventListener( 'MSPointerMove', onPointerMove, false );
|
||||
dom.wrapper.addEventListener( 'MSPointerUp', onPointerUp, false );
|
||||
}
|
||||
// IE 11 uses un-prefixed version of pointer events
|
||||
if( window.navigator.pointerEnabled ) {
|
||||
dom.wrapper.addEventListener( 'pointerdown', onPointerDown, false );
|
||||
dom.wrapper.addEventListener( 'pointermove', onPointerMove, false );
|
||||
dom.wrapper.addEventListener( 'pointerup', onPointerUp, false );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if( config.keyboard ) {
|
||||
|
||||
Vendored
+2
-10
@@ -1,16 +1,8 @@
|
||||
/*!
|
||||
<<<<<<< HEAD
|
||||
* reveal.js 2.6.0-dev (2013-09-19, 23:31)
|
||||
=======
|
||||
* reveal.js 2.6.0-dev (2013-10-01, 13:54)
|
||||
>>>>>>> origin/master
|
||||
* reveal.js 2.6.0-dev (2013-10-01, 15:12)
|
||||
* http://lab.hakim.se/reveal-js
|
||||
* MIT licensed
|
||||
*
|
||||
* Copyright (C) 2013 Hakim El Hattab, http://hakim.se
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
var Reveal=function(){"use strict";function a(a){return b(),Lb||Kb?(window.addEventListener("load",C,!1),l(Rb,a),s(),c(),void 0):(document.body.setAttribute("class","no-transforms"),void 0)}function b(){Kb="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,Lb="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,Mb=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=Rb.dependencies.length;f>e;e++){var g=Rb.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(){Wb.slides.classList.remove("no-transition"),Sb=!0,u("ready",{indexh:Gb,indexv:Hb,currentSlide:Jb})},1)}function e(){var a=m(document.querySelectorAll(Ob));a.forEach(function(a){var b=m(a.querySelectorAll("section"));b.forEach(function(a,b){b>0&&a.classList.add("future")})})}function f(){Wb.theme=document.querySelector("#theme"),Wb.wrapper=document.querySelector(".reveal"),Wb.slides=document.querySelector(".reveal .slides"),Wb.slides.classList.add("no-transition"),Wb.background=g(Wb.wrapper,"div","backgrounds",null),Wb.progress=g(Wb.wrapper,"div","progress","<span></span>"),Wb.progressbar=Wb.progress.querySelector("span"),g(Wb.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),g(Wb.wrapper,"div","state-background",null),g(Wb.wrapper,"div","pause-overlay",null),Wb.controls=document.querySelector(".reveal .controls"),Wb.controlsLeft=m(document.querySelectorAll(".navigate-left")),Wb.controlsRight=m(document.querySelectorAll(".navigate-right")),Wb.controlsUp=m(document.querySelectorAll(".navigate-up")),Wb.controlsDown=m(document.querySelectorAll(".navigate-down")),Wb.controlsPrev=m(document.querySelectorAll(".navigate-prev")),Wb.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)||/\.(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"),Wb.background.innerHTML="",Wb.background.classList.add("no-transition"),m(document.querySelectorAll(Ob)).forEach(function(b){var c;c=r()?a(b,b):a(b,Wb.background),m(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})}),Rb.parallaxBackgroundImage?(Wb.background.style.backgroundImage='url("'+Rb.parallaxBackgroundImage+'")',Wb.background.style.backgroundSize=Rb.parallaxBackgroundSize,setTimeout(function(){Wb.wrapper.classList.add("has-parallax-background")},1)):(Wb.background.style.backgroundImage="",Wb.wrapper.classList.remove("has-parallax-background"))}function i(a){if(Wb.wrapper.classList.remove(Rb.transition),"object"==typeof a&&l(Rb,a),Kb===!1&&(Rb.transition="linear"),Wb.wrapper.classList.add(Rb.transition),Wb.wrapper.setAttribute("data-transition-speed",Rb.transitionSpeed),Wb.wrapper.setAttribute("data-background-transition",Rb.backgroundTransition),Wb.controls.style.display=Rb.controls?"block":"none",Wb.progress.style.display=Rb.progress?"block":"none",Rb.rtl?Wb.wrapper.classList.add("rtl"):Wb.wrapper.classList.remove("rtl"),Rb.center?Wb.wrapper.classList.add("center"):Wb.wrapper.classList.remove("center"),Rb.mouseWheel?(document.addEventListener("DOMMouseScroll",ub,!1),document.addEventListener("mousewheel",ub,!1)):(document.removeEventLiLine truncated
|
||||
=======
|
||||
var Reveal=function(){"use strict";function a(a){return b(),Kb||Jb?(window.addEventListener("load",C,!1),l(Qb,a),s(),c(),void 0):(document.body.setAttribute("class","no-transforms"),void 0)}function b(){Jb="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,Kb="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,Lb=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=Qb.dependencies.length;f>e;e++){var g=Qb.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(),_(),setTimeout(function(){Vb.slides.classList.remove("no-transition"),Rb=!0,u("ready",{indexh:Fb,indexv:Gb,currentSlide:Ib})},1)}function e(){var a=m(document.querySelectorAll(Nb));a.forEach(function(a){var b=m(a.querySelectorAll("section"));b.forEach(function(a,b){b>0&&a.classList.add("future")})})}function f(){Vb.theme=document.querySelector("#theme"),Vb.wrapper=document.querySelector(".reveal"),Vb.slides=document.querySelector(".reveal .slides"),Vb.slides.classList.add("no-transition"),Vb.background=g(Vb.wrapper,"div","backgrounds",null),Vb.progress=g(Vb.wrapper,"div","progress","<span></span>"),Vb.progressbar=Vb.progress.querySelector("span"),g(Vb.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),g(Vb.wrapper,"div","state-background",null),g(Vb.wrapper,"div","pause-overlay",null),Vb.controls=document.querySelector(".reveal .controls"),Vb.controlsLeft=m(document.querySelectorAll(".navigate-left")),Vb.controlsRight=m(document.querySelectorAll(".navigate-right")),Vb.controlsUp=m(document.querySelectorAll(".navigate-up")),Vb.controlsDown=m(document.querySelectorAll(".navigate-down")),Vb.controlsPrev=m(document.querySelectorAll(".navigate-prev")),Vb.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)||/\.(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"),Vb.background.innerHTML="",Vb.background.classList.add("no-transition"),m(document.querySelectorAll(Nb)).forEach(function(b){var c;c=r()?a(b,b):a(b,Vb.background),m(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})})}function i(a){if(Vb.wrapper.classList.remove(Qb.transition),"object"==typeof a&&l(Qb,a),Jb===!1&&(Qb.transition="linear"),Vb.wrapper.classList.add(Qb.transition),Vb.wrapper.setAttribute("data-transition-speed",Qb.transitionSpeed),Vb.wrapper.setAttribute("data-background-transition",Qb.backgroundTransition),Vb.controls.style.display=Qb.controls?"block":"none",Vb.progress.style.display=Qb.progress?"block":"none",Qb.rtl?Vb.wrapper.classList.add("rtl"):Vb.wrapper.classList.remove("rtl"),Qb.center?Vb.wrapper.classList.add("center"):Vb.wrapper.classList.remove("center"),Qb.mouseWheel?(document.addEventListener("DOMMouseScroll",tb,!1),document.addEventListener("mousewheel",tb,!1)):(document.removeEventListener("DOMMouseScroll",tb,!1),document.removeEventListener("mousewheel",tb,!1)),Qb.rollingLinks?v():w(),Qb.previewLinks?x():(y(),x("[data-preview-link]")),Qb.theme&&Vb.theme){var b=Vb.theme.getAttribute("href"),c=/[^\/]*?(?=\.css)/,d=b.match(c)[0];Qb.theme!==d&&(b=b.replace(c,Qb.theme),Vb.theme.setAttribute("href",b))}R()}function j(){_b=Line truncated
|
||||
>>>>>>> origin/master
|
||||
var Reveal=function(){"use strict";function a(a){return b(),Lb||Kb?(window.addEventListener("load",C,!1),l(Rb,a),s(),c(),void 0):(document.body.setAttribute("class","no-transforms"),void 0)}function b(){Kb="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,Lb="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,Mb=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=Rb.dependencies.length;f>e;e++){var g=Rb.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(){Wb.slides.classList.remove("no-transition"),Sb=!0,u("ready",{indexh:Gb,indexv:Hb,currentSlide:Jb})},1)}function e(){var a=m(document.querySelectorAll(Ob));a.forEach(function(a){var b=m(a.querySelectorAll("section"));b.forEach(function(a,b){b>0&&a.classList.add("future")})})}function f(){Wb.theme=document.querySelector("#theme"),Wb.wrapper=document.querySelector(".reveal"),Wb.slides=document.querySelector(".reveal .slides"),Wb.slides.classList.add("no-transition"),Wb.background=g(Wb.wrapper,"div","backgrounds",null),Wb.progress=g(Wb.wrapper,"div","progress","<span></span>"),Wb.progressbar=Wb.progress.querySelector("span"),g(Wb.wrapper,"aside","controls",'<div class="navigate-left"></div><div class="navigate-right"></div><div class="navigate-up"></div><div class="navigate-down"></div>'),g(Wb.wrapper,"div","state-background",null),g(Wb.wrapper,"div","pause-overlay",null),Wb.controls=document.querySelector(".reveal .controls"),Wb.controlsLeft=m(document.querySelectorAll(".navigate-left")),Wb.controlsRight=m(document.querySelectorAll(".navigate-right")),Wb.controlsUp=m(document.querySelectorAll(".navigate-up")),Wb.controlsDown=m(document.querySelectorAll(".navigate-down")),Wb.controlsPrev=m(document.querySelectorAll(".navigate-prev")),Wb.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)||/\.(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"),Wb.background.innerHTML="",Wb.background.classList.add("no-transition"),m(document.querySelectorAll(Ob)).forEach(function(b){var c;c=r()?a(b,b):a(b,Wb.background),m(b.querySelectorAll("section")).forEach(function(b){r()?a(b,b):a(b,c)})}),Rb.parallaxBackgroundImage?(Wb.background.style.backgroundImage='url("'+Rb.parallaxBackgroundImage+'")',Wb.background.style.backgroundSize=Rb.parallaxBackgroundSize,setTimeout(function(){Wb.wrapper.classList.add("has-parallax-background")},1)):(Wb.background.style.backgroundImage="",Wb.wrapper.classList.remove("has-parallax-background"))}function i(a){if(Wb.wrapper.classList.remove(Rb.transition),"object"==typeof a&&l(Rb,a),Kb===!1&&(Rb.transition="linear"),Wb.wrapper.classList.add(Rb.transition),Wb.wrapper.setAttribute("data-transition-speed",Rb.transitionSpeed),Wb.wrapper.setAttribute("data-background-transition",Rb.backgroundTransition),Wb.controls.style.display=Rb.controls?"block":"none",Wb.progress.style.display=Rb.progress?"block":"none",Rb.rtl?Wb.wrapper.classList.add("rtl"):Wb.wrapper.classList.remove("rtl"),Rb.center?Wb.wrapper.classList.add("center"):Wb.wrapper.classList.remove("center"),Rb.mouseWheel?(document.addEventListener("DOMMouseScroll",ub,!1),document.addEventListener("mousewheel",ub,!1)):(document.removeEventLiLine truncated
|
||||
Reference in new issue
Block a user