forked from hammerjs/hammer.js
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
70bc2ba
commit 35e923e
Showing
8 changed files
with
19 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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]>; | ||
|
@@ -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 = { | ||
|
@@ -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', | ||
|
@@ -114,6 +115,7 @@ function setup() { | |
Hammer.READY = true; | ||
} | ||
|
||
|
||
var Utils = Hammer.utils = { | ||
/** | ||
* extend method, | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.