Merge pull request #342 from jantimon/master

Fixes issue #331 - "jquery.hammer.js can't used in requirejs"
hammerjs · Sep 3, 2013 · 74c85b3 · 74c85b3
2 parents 5f95703 + afc7e15
commit 74c85b3
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 deletions.
diff --git a/dist/hammer.js b/dist/hammer.js
@@ -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;
     });
 }

diff --git a/dist/jquery.hammer.js b/dist/jquery.hammer.js
@@ -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;
     });
 }
@@ -1435,12 +1435,13 @@ else {
 })(this);
 
 
-(function($, undefined) {
-    'use strict';
+(function(undefined) {
+  'use strict';
+  var init = function(Hammer, $) {
 
     // no jQuery or Zepto!
     if($ === undefined) {
-        return;
+        return Hammer;
     }
 
     /**
@@ -1541,4 +1542,14 @@ else {
         });
     };
 
-})(window.jQuery || window.Zepto);
+    return Hammer;
+  };
+
+
+  if (typeof define === 'function' && typeof define.amd === 'object' && define.amd) {
+    define('hammer-jquery', ['hammer', 'jquery'], init);
+  } else {
+    init(window.Hammer, window.jQuery || window.Zepto);
+  }
+
+}());