From 9eb8169458a5f24d5ebb92d1d3ea8878316ae160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Fri, 2 May 2014 14:56:18 -0700 Subject: [PATCH] Bug 1003836 - Don't use createEvent("TouchEvent") to check if TouchEvents are supported r=smaug --- dom/browser-element/BrowserElementPanning.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dom/browser-element/BrowserElementPanning.js b/dom/browser-element/BrowserElementPanning.js index dabed75e3a02..22a26d6abc2b 100644 --- a/dom/browser-element/BrowserElementPanning.js +++ b/dom/browser-element/BrowserElementPanning.js @@ -50,9 +50,9 @@ const ContentPanning = { }, _setupListenersForPanning: function cp_setupListenersForPanning() { - var events; - try { - content.document.createEvent('TouchEvent'); + let events; + + if (content.TouchEvent) { events = ['touchstart', 'touchend', 'touchmove']; this.watchedEventsType = 'touch'; #ifdef MOZ_WIDGET_GONK @@ -65,7 +65,7 @@ const ContentPanning = { .processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; this.hybridEvents = isParentProcess; #endif - } catch(e) { + } else { // Touch events aren't supported, so fall back on mouse. events = ['mousedown', 'mouseup', 'mousemove']; this.watchedEventsType = 'mouse';