Update FastClick

Thibaut committed 12 years ago

Commit 9da56011 parent f135d991 file · +35 −17Browse files

Unified · Split

assets/javascripts/vendor/fastclick.js+35−17

 /**
  * @preserve FastClick: polyfill to remove click delays on browsers with touch UIs.
  *
- * @version 1.0.0
+ * @version 1.0.1
  * @codingstandard ftlabs-jsv2
  * @copyright The Financial Times Limited [All Rights Reserved]
  * @license MIT License (see LICENSE.txt)
  *
  * @constructor
  * @param {Element} layer The layer to listen on
+ * @param {Object} options The options to override the defaults
  */
-function FastClick(layer) {
+function FastClick(layer, options) {
 	'use strict';
 	var oldOnClick;
+	options = options || {};
 	/**
 	 * Whether a click is currently being tracked.
 	/**
-	 * Timestamp for when when click tracking started.
+	 * Timestamp for when click tracking started.
 	 *
 	 * @type number
 	 */
 	 *
 	 * @type number
 	 */
-	this.touchBoundary = 10;
+	this.touchBoundary = options.touchBoundary || 10;
 	/**
 	 */
 	this.layer = layer;
+	/**
+	 * The minimum time between tap(touchstart and touchend) events
+	 *
+	 * @type number
+	 */
+	this.tapDelay = options.tapDelay || 200;
 	if (FastClick.notNeeded(layer)) {
 		return;
 	}
 		return function() { return method.apply(context, arguments); };
 	}
+	var methods = ['onMouse', 'onClick', 'onTouchStart', 'onTouchMove', 'onTouchEnd', 'onTouchCancel'];
+	var context = this;
+	for (var i = 0, l = methods.length; i < l; i++) {
+		context[methods[i]] = bind(context[methods[i]], context);
+	}
 	// Set up event handlers as required
 	if (deviceIsAndroid) {
-		layer.addEventListener('mouseover', bind(this.onMouse, this), true);
+		layer.addEventListener('mouseover', this.onMouse, true);
-		layer.addEventListener('mousedown', bind(this.onMouse, this), true);
+		layer.addEventListener('mousedown', this.onMouse, true);
-		layer.addEventListener('mouseup', bind(this.onMouse, this), true);
+		layer.addEventListener('mouseup', this.onMouse, true);
 	}
-	layer.addEventListener('click', bind(this.onClick, this), true);
+	layer.addEventListener('click', this.onClick, true);
-	layer.addEventListener('touchstart', bind(this.onTouchStart, this), false);
+	layer.addEventListener('touchstart', this.onTouchStart, false);
-	layer.addEventListener('touchmove', bind(this.onTouchMove, this), false);
+	layer.addEventListener('touchmove', this.onTouchMove, false);
-	layer.addEventListener('touchend', bind(this.onTouchEnd, this), false);
+	layer.addEventListener('touchend', this.onTouchEnd, false);
-	layer.addEventListener('touchcancel', bind(this.onTouchCancel, this), false);
+	layer.addEventListener('touchcancel', this.onTouchCancel, false);
 	// Hack is required for browsers that don't support Event#stopImmediatePropagation (e.g. Android 2)
 	// which is how FastClick normally stops click events bubbling to callbacks registered on the FastClick
 	this.touchStartY = touch.pageY;
 	// Prevent phantom clicks on fast double-tap (issue #36)
-	if ((event.timeStamp - this.lastClickTime) < 200) {
+	if ((event.timeStamp - this.lastClickTime) < this.tapDelay) {
 		event.preventDefault();
 	}
 	}
 	// Prevent phantom clicks on fast double-tap (issue #36)
-	if ((event.timeStamp - this.lastClickTime) < 200) {
+	if ((event.timeStamp - this.lastClickTime) < this.tapDelay) {
 		this.cancelNextClick = true;
 		return true;
 	}
 		this.sendClick(targetElement, event);
 		// Select elements need the event to go through on iOS 4, otherwise the selector menu won't open.
-		if (!deviceIsIOS4 || targetTagName !== 'select') {
+		// Also this breaks opening selects when VoiceOver is active on iOS6, iOS7 (and possibly others)
+		if (!deviceIsIOS || targetTagName !== 'select') {
 			this.targetElement = null;
 			event.preventDefault();
 		}
  * Factory method for creating a FastClick object
  *
  * @param {Element} layer The layer to listen on
+ * @param {Object} options The options to override the defaults
  */
-FastClick.attach = function(layer) {
+FastClick.attach = function(layer, options) {
 	'use strict';
-	return new FastClick(layer);
+	return new FastClick(layer, options);
 };