fix touch functionality in Edge

ixisio · Aug 14, 2015 · 3d3b29e · 3d3b29e
1 parent c92dd72
commit 3d3b29e
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 * Code style refactoring
 * #16: Wrap js libs in IIFEs
 
+### 0.8.1 - 2015-08-14
+* Update touch support detection for Edge
+
 ### 0.8.0 - 2014-07-22
 * Clean up documentation and featureRequest
 * Create separate CHANGELOG file

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -27,7 +27,7 @@ module.exports = function(grunt) {
       header: '+function ($) {\n' +
               '  "use strict";\n' +
               '\n' +
-              '  if (!("ontouchstart" in window || navigator.msMaxTouchPoints)) return false \n\n',
+              '  if (!("ontouchstart" in window || "PointerEvent" in window || navigator.msMaxTouchPoints)) return false \n\n',
       footer: '}(window.jQuery);'
     },
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-touch-carousel",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "homepage": "https://github.com/ixisio/bootstrap-touch-carousel",
   "authors": [
     "Andreas Klein",

diff --git a/dist/css/bootstrap-touch-carousel.css b/dist/css/bootstrap-touch-carousel.css
diff --git a/dist/js/bootstrap-touch-carousel.js b/dist/js/bootstrap-touch-carousel.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap-touch-carousel",
   "description": "A drop-in perfection for Twitter Bootstrap's Carousel (v3) to enable gestures on touch devices.",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "keywords": [
     "bootstrap",
     "touch",

diff --git a/src/js/tests/unit/carousel.js b/src/js/tests/unit/carousel.js
@@ -7,7 +7,7 @@ $(function () {
       // console.log( "ontouchstart" in window ? true: false); // return true in PhantomJS
 
       test("Should run plugin because touchevents are enabled", function() {
-        var hasTouchEvents = ("ontouchstart" in window || navigator.msMaxTouchPoints) ? true : false;
+        var hasTouchEvents = ("ontouchstart" in window || "PointerEvent" in window || navigator.msMaxTouchPoints) ? true : false;
         equal(hasTouchEvents, true, "touch events should be enabled")
         ok(typeof $(document.body).carousel().data('touch-carousel') === "object", "TouchCarousel Plugin is running")
       })

diff --git a/src/js/touch-carousel.js b/src/js/touch-carousel.js
@@ -4,7 +4,7 @@
   /**
    * Return whole plugin if touch is not supported
    */
-  if (!("ontouchstart" in window || navigator.msMaxTouchPoints)) return false;
+  if (!("ontouchstart" in window || "PointerEvent" in window || "navigator.msMaxTouchPoints)) return false;
 
   // CONST
   var NAMESPACE = 'touch-carousel';

diff --git a/src/js/transition.js b/src/js/transition.js
@@ -4,7 +4,7 @@
   /**
    * Return whole plugin if touch is not supported
    */
-  if (!("ontouchstart" in window || navigator.msMaxTouchPoints)) {
+  if (!("ontouchstart" in window || "PointerEvent" in window || navigator.msMaxTouchPoints)) {
     return false;
   }