Skip to content

Commit

Permalink
touch-action issue fix
Browse files Browse the repository at this point in the history
  • Loading branch information
jtangelder committed May 20, 2014
1 parent 70bc2ba commit 35e923e
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 46 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hammerjs",
"version": "1.0.10",
"version": "1.0.11",
"main": "hammer.js",
"ignore": [
"tests",
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hammerjs",
"version": "1.0.10",
"version": "1.0.11",
"main": "hammer.js",
"scripts": [
"hammer.js"
Expand Down
12 changes: 7 additions & 5 deletions hammer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Hammer.JS - v1.0.10 - 2014-03-28
/*! Hammer.JS - v1.0.11 - 2014-05-20
* http://eightmedia.github.io/hammer.js
*
* Copyright (c) 2014 Jorik Tangelder <[email protected]>;
Expand All @@ -19,7 +19,7 @@ var Hammer = function(element, options) {
return new Hammer.Instance(element, options || {});
};

Hammer.VERSION = '1.0.10';
Hammer.VERSION = '1.0.11';

// default settings
Hammer.defaults = {
Expand All @@ -30,9 +30,10 @@ Hammer.defaults = {
stop_browser_behavior: {
// this also triggers onselectstart=false for IE
userSelect : 'none',
// this makes the element blocking in IE10>, you could experiment with the value
// see for more options this issue; https://github.com/EightMedia/hammer.js/issues/241
touchAction : 'none',
// this makes the element blocking in IE10> and Chrome 35>, you could experiment with the value
// see for more options the wiki: https://github.com/EightMedia/hammer.js/wiki
touchAction : 'pan-y',

touchCallout : 'none',
contentZooming : 'none',
userDrag : 'none',
Expand Down Expand Up @@ -114,6 +115,7 @@ function setup() {
Hammer.READY = true;
}


var Utils = Hammer.utils = {
/**
* extend method,
Expand Down
4 changes: 2 additions & 2 deletions hammer.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hammer.min.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "hammerjs",
"title": "Hammer.JS",
"description": "A javascript library for multi-touch gestures",
"version": "1.0.10",
"version": "1.0.11",
"homepage": "http://eightmedia.github.io/hammer.js",
"licenses": [
{
Expand Down Expand Up @@ -34,7 +34,7 @@
"grunt-contrib-jshint": "0.9.x",
"grunt-contrib-watch": "0.6.x",
"grunt-contrib-qunit": "0.4.x",
"faketouches": "git://github.com/jtangelder/faketouches.js.git",
"faketouches": "0.0.3",
"underscore": "1.6.x",
"grunt-string-replace": "^0.2.7"
},
Expand Down
9 changes: 5 additions & 4 deletions src/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ Hammer.defaults = {
stop_browser_behavior: {
// this also triggers onselectstart=false for IE
userSelect : 'none',
// this makes the element blocking in IE10>, you could experiment with the value
// see for more options this issue; https://github.com/EightMedia/hammer.js/issues/241
touchAction : 'none',
// this makes the element blocking in IE10> and Chrome 35>, you could experiment with the value
// see for more options the wiki: https://github.com/EightMedia/hammer.js/wiki
touchAction : 'pan-y',

touchCallout : 'none',
contentZooming : 'none',
userDrag : 'none',
Expand Down Expand Up @@ -103,4 +104,4 @@ function setup() {

// Hammer is ready...!
Hammer.READY = true;
}
}
30 changes: 0 additions & 30 deletions tests/pointerevents_mouse.html

This file was deleted.

0 comments on commit 35e923e

Please sign in to comment.