Skip to content

Commit

Permalink
Fixes issue hammerjs#331 - "jquery.hammer.js can't used in requirejs"
Browse files Browse the repository at this point in the history
  • Loading branch information
jantimon committed Aug 14, 2013
1 parent c9711ac commit afc7e15
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion dist/hammer.js
Expand Up @@ -1421,7 +1421,7 @@ Hammer.gestures.Release = {
// some AMD build optimizers, like r.js, check for specific condition patterns like the following:
if(typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
// define as an anonymous module
define(function() {
define('hammer', function() {
return Hammer;
});
}
Expand Down
4 changes: 2 additions & 2 deletions dist/jquery.hammer.js
Expand Up @@ -1421,7 +1421,7 @@ Hammer.gestures.Release = {
// some AMD build optimizers, like r.js, check for specific condition patterns like the following:
if(typeof define == 'function' && typeof define.amd == 'object' && define.amd) {
// define as an anonymous module
define(function() {
define('hammer', function() {
return Hammer;
});
}
Expand Down Expand Up @@ -1547,7 +1547,7 @@ else {


if (typeof define === 'function' && typeof define.amd === 'object' && define.amd) {
define(["hammer", "jquery"], init);
define('hammer-jquery', ['hammer', 'jquery'], init);
} else {
init(window.Hammer, window.jQuery || window.Zepto);
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/jquery.hammer.js
Expand Up @@ -110,7 +110,7 @@


if (typeof define === 'function' && typeof define.amd === 'object' && define.amd) {
define(["hammer", "jquery"], init);
define('hammer-jquery', ['hammer', 'jquery'], init);
} else {
init(window.Hammer, window.jQuery || window.Zepto);
}
Expand Down

0 comments on commit afc7e15

Please sign in to comment.