another useless commit message

Gruntfile.coffee

@@ -15,6 +15,7 @@ module.exports = (grunt) ->
         src: [
           'src/hammer.prefix'
           'src/hammer.js'
+          'src/utils.js'
           'src/*.js'
           'src/**/*.js'
           'src/export.js'

src/export.js

@@ -1,8 +1,16 @@
-if(typeof define == "function" && define.amd) {
+// expose some methods
+Hammer.register = registerGesture;
+Hammer.each = each;
+Hammer.merge = merge;
+Hammer.bindFn = bindFn;
+Hammer.prefixed = prefixed;
+
+// export to amd/module/window
+if(typeof define == TYPE_FUNCTION && define.amd) {
     define(function() {
         return Hammer;
     });
-} else if(typeof module !== "undefined" && module.exports) {
+} else if(typeof module != TYPE_UNDEFINED && module.exports) {
     module.exports = Hammer;
 } else {
     window.Hammer = Hammer;

src/gestures.js

@@ -20,10 +20,10 @@ Gestures.prototype.update = function(inputData) {
  * @param {Object} options
  * @param {Function} handler
  */
-Gestures.register = function(options, handler) {
+function registerGesture(options, handler) {
     registeredGestures.push({
         options: options,
         handler: handler
     });
-    extend(DEFAULT_OPTIONS, options);
-};
+    merge(DEFAULT_OPTIONS, options);
+}

src/gestures/drag.js

@@ -1,7 +1,7 @@
 /**
  * drag gesture
  */
-Gestures.register({
+registerGesture({
     dragThreshold: 5
 },
 function(inst, inputData, session) {

src/gestures/gesture.js

@@ -1,6 +1,6 @@
 /**
  * global gesture
  */
-Gestures.register({ }, function(inst, inputData) {
+registerGesture({}, function(inst, inputData) {
     inst.trigger("gesture", inputData);
 });

src/gestures/transform.js

@@ -1,7 +1,7 @@
 /**
  * transform gesture
  */
-Gestures.register({
+registerGesture({
     scaleThreshold: 5,
     rotationThreshold: 3
 },

src/hammer.js

@@ -1,3 +1,6 @@
+var TYPE_FUNCTION = "function";
+var TYPE_UNDEFINED = "undefined";
+
 var DEFAULT_OPTIONS = {
     touchAction: "pan-y"
 };
@@ -19,6 +22,7 @@ function Hammer(element, options) {
     this.gestures = new Gestures(this);
 }
 
+// expose
 Hammer.defaults = DEFAULT_OPTIONS;
 
 /**

src/input.js

@@ -1,6 +1,6 @@
 var MOBILE_REGEX = /mobile|tablet|ip(ad|hone|od)|android|silk/i;
 
-var SUPPORT_POINTER_EVENTS = window.PointerEvent || window.MSPointerEvent;
+var SUPPORT_POINTER_EVENTS = prefixed("PointerEvent", window);
 var SUPPORT_TOUCH = ("ontouchstart" in window);
 var SUPPORT_ONLY_TOUCH = SUPPORT_TOUCH && MOBILE_REGEX.test(navigator.userAgent);
 

src/input/pointerevent.js

@@ -1,5 +1,3 @@
-var MS_POINTER = window.MSPointerEvent;
-
 var POINTER_SRC_EVENT_MAP = {
     pointerdown: SRC_EVENT_START,
     pointermove: SRC_EVENT_MOVE,
@@ -11,13 +9,13 @@ var POINTER_SRC_EVENT_MAP = {
 var POINTER_ELEMENT_EVENTS = "pointerdown pointermove pointerup pointercancel";
 var POINTER_WINDOW_EVENTS = "pointerout";
 
-var POINTER_TYPE_MAP = {
+var IE10_POINTER_TYPE_MAP = {
     2: INPUT_TYPE_TOUCH,
     3: INPUT_TYPE_PEN,
     4: INPUT_TYPE_MOUSE
 };
 
-if(MS_POINTER) {
+if(window.MSPointerEvent) {
     POINTER_ELEMENT_EVENTS = "MSPointerDown MSPointerMove MSPointerUp MSPointerCancel";
     POINTER_WINDOW_EVENTS = "MSPointerOut";
 }
@@ -55,7 +53,7 @@ Input.PointerEvent.prototype = {
         if(evType == "pointerdown") {
             // pointer must be down
             store.push(ev);
-            element[(MS_POINTER ? "msSetPointerCapture" : "setPointerCapture")](ev.pointerId);
+            prefixed("setPointerCapture", element, [ev.pointerId]);
         } else if(evType == "pointerup" || evType == "pointerout" || evType == "pointercancel") {
             // we've lost the pointer
             removePointer = true;
@@ -74,7 +72,7 @@ Input.PointerEvent.prototype = {
         var data = {
             pointers: store,
             changedPointers: [ev],
-            pointerType: POINTER_TYPE_MAP[store[0].pointerType] || store[0].pointerType, // IE10 returns integers
+            pointerType: IE10_POINTER_TYPE_MAP[store[0].pointerType] || store[0].pointerType,
             srcEvent: ev
         };
 
@@ -83,7 +81,7 @@ Input.PointerEvent.prototype = {
         if(removePointer) {
             // remove from the store
             store.splice(storeIndex, 1);
-            element[(MS_POINTER ? "msReleasePointerCapture" : "releasePointerCapture")](ev.pointerId);
+            prefixed("releasePointerCapture", element, [ev.pointerId]);
         }
     },
 

src/touchaction.js

@@ -2,8 +2,7 @@
  * set and mimic the touch-action property
  */
 
-var BODY_STYLE = document.body.style;
-var NATIVE_TOUCH_ACTION = ("touchAction" in BODY_STYLE) || ("msTouchAction" in BODY_STYLE);
+var NATIVE_TOUCH_ACTION = prefixed("touchAction", document.body.style);
 
 function TouchAction(inst, value) {
     this.inst = inst;
@@ -15,9 +14,7 @@ TouchAction.prototype = {
         this.value = value;
 
         if(NATIVE_TOUCH_ACTION) {
-            var style = this.inst.element.style;
-            style.touchAction = value;
-            style.msTouchAction = value;
+            prefixed("touchAction", this.inst.element.style, value);
         }
     },
 
@@ -26,7 +23,9 @@ TouchAction.prototype = {
         var touchAction = this.value;
 
         // not needed for native and mouse input
-        if(!NATIVE_TOUCH_ACTION || inputData.pointerType == INPUT_TYPE_MOUSE || inputData.srcType == SRC_EVENT_START) {
+        if(!NATIVE_TOUCH_ACTION ||
+            inputData.pointerType == INPUT_TYPE_MOUSE ||
+            inputData.srcType == SRC_EVENT_START) {
             return;
         }
 

src/utils.js

@@ -1,3 +1,5 @@
+var VENDOR_PREFIXES = ["", "webkit", "moz", "MS", "ms"];
+
 /**
  * walk objects and arrays
  * @param {Object} obj
@@ -24,7 +26,13 @@ function each(obj, iterator, context) {
     }
 }
 
-function extend(dest, src) {
+/**
+ * merge the values from src in the dest
+ * @param {Object} dest
+ * @param {Object} src
+ * @returns {Object} dest
+ */
+function merge(dest, src) {
     for(var key in src) {
         if(!src.hasOwnProperty(key)) {
             continue;
@@ -125,6 +133,35 @@ function uniqueArray(src, key) {
         }
         keys.push(item[key]);
     });
-
     return results;
 }
+
+/**
+ * get/set (vendor prefixed) property. allows css properties, properties and functions.
+ * if you want to call a function by this function, you should pass an array with arguments (see .apply())
+ * else, a bindFn function will be returned
+ *
+ * @param {String} property
+ * @param {Object} obj
+ * @param {*} [val]
+ * @returns {*}
+ */
+function prefixed(property, obj, val) {
+    var prefix, prop, i;
+    var camelProp = property[0].toUpperCase() + property.slice(1);
+
+    for(i = 0; i < VENDOR_PREFIXES.length; i++) {
+        prefix = VENDOR_PREFIXES[i];
+        prop = (prefix) ? prefix + camelProp : property;
+
+        if(!(prop in obj)) {
+            continue;
+        } else if(typeof obj[prop] == TYPE_FUNCTION) {
+            return (typeof val == TYPE_UNDEFINED) ? bindFn(prop, obj) : obj[prop].apply(obj, val);
+        } else if(val) {
+            obj[prop] = val;
+        }
+        return obj[prop];
+    }
+    return null;
+}

tests/manual/log.html

@@ -3,7 +3,7 @@
 <head>
     <meta name="viewport" content="width=device-width, user-scalable=no">
     <title></title>
-    <script src="http://192.168.0.112:8081/target/target-script-min.js"></script>
+    <!--<script src="http://192.168.0.112:8081/target/target-script-min.js"></script>-->
 </head>
 <body>
     <pre style="background: silver; width: 100%; height: 400px; overflow: hidden" id="hit"></pre>
@@ -33,8 +33,6 @@
             el.textContent = ev.gesture.toDirString();
         }
 
-
-
     </script>
 </body>
 </html>