Attachment 231367 Details for Bug 408803 – Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch

Enable-touch-event-handling-on-Firefox-on-Android.patch (text/plain), 4.00 KB, created by Tim Buschtoens

on 2013-05-23 08:32:54 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Buschtoens

Created: 2013-05-23 08:32:54 EDT

Size: 4.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>diff --git js/rwt/client/Client.js js/rwt/client/Client.js
>index e029891..0cbab15 100644
>--- js/rwt/client/Client.js
>+++ js/rwt/client/Client.js
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright: 2004, 2012 1&1 Internet AG, Germany, http://www.1und1.de,
>+ * Copyright: 2004, 2013 1&1 Internet AG, Germany, http://www.1und1.de,
>  *                       and EclipseSource
>  *
>  * This program and the accompanying materials are made available under the
>@@ -152,12 +152,19 @@
>       return this.getPlatform() === "android" && this.getBrowser() === "android";
>     },
> 
>+    isMobileFirefox : function() {
>+      return this.getPlatform() === "android" && this.getBrowser() === "firefox";
>+    },
>+
>     supportsVml : function() {
>       return ( this.getEngine() === "mshtml" ) && ( this.getVersion() >= 5.5 );
>     },
> 
>     supportsTouch : function() {
>-      return this.isMobileSafari() || this.isAndroidBrowser() || this.isMobileChrome();
>+      return    this.isMobileSafari()
>+             || this.isAndroidBrowser()
>+             || this.isMobileChrome()
>+             || this.isMobileFirefox();
>     },
> 
>     supportsSvg : function() {
>diff --git js/rwt/runtime/MobileWebkitSupport.js js/rwt/runtime/MobileWebkitSupport.js
>index 8df9b47..ef3c9676 100644
>--- js/rwt/runtime/MobileWebkitSupport.js
>+++ js/rwt/runtime/MobileWebkitSupport.js
>@@ -127,26 +127,42 @@
> 
>     _registerListeners : function() {
>       var target = document.body;
>-      target.ontouchstart = this.__onTouchEvent;
>-      target.ontouchmove = this.__onTouchEvent;
>-      target.ontouchend = this.__onTouchEvent;
>-      target.ontouchcancel = this.__onTouchEvent;
>-      target.ongesturestart = this.__onGestureEvent;
>-      target.ongesturechange = this.__onGestureEvent;
>-      target.ongestureend = this.__onGestureEvent;
>-      target.onorientationchange = this.__onOrientationEvent;
>+      if( rwt.client.Client.isGecko() ) {
>+        target.addEventListener( "touchstart", this.__onTouchEvent, false );
>+        target.addEventListener( "touchmove", this.__onTouchEvent, false );
>+        target.addEventListener( "touchend", this.__onTouchEvent, false );
>+        target.addEventListener( "touchcancel", this.__onTouchEvent, false );
>+        target.addEventListener( "deviceorientation", this.__onOrientationEvent, false );
>+      } else {
>+        target.ontouchstart = this.__onTouchEvent;
>+        target.ontouchmove = this.__onTouchEvent;
>+        target.ontouchend = this.__onTouchEvent;
>+        target.ontouchcancel = this.__onTouchEvent;
>+        target.ongesturestart = this.__onGestureEvent;
>+        target.ongesturechange = this.__onGestureEvent;
>+        target.ongestureend = this.__onGestureEvent;
>+        target.onorientationchange = this.__onOrientationEvent;
>+      }
>     },
> 
>     _removeListeners : function() {
>       var target = document.body;
>-      target.ontouchstart = null;
>-      target.ontouchmove = null;
>-      target.ontouchend = null;
>-      target.ontouchcancel = null;
>-      target.ongesturestart = null;
>-      target.ongesturechange = null;
>-      target.ongestureend = null;
>-      target.onorientationchange = null;
>+      if( rwt.client.Client.isGecko() ) {
>+        target.removeEventListener( "touchstart", this.__onTouchEvent, false );
>+        target.removeEventListener( "touchmove", this.__onTouchEvent, false );
>+        target.removeEventListener( "touchend", this.__onTouchEvent, false );
>+        target.removeEventListener( "touchcancel", this.__onTouchEvent, false );
>+        target.removeEventListener( "deviceorientation", this.__onOrientationEvent, false );
>+      } else {
>+        target.ontouchstart = null;
>+        target.ontouchmove = null;
>+        target.ontouchend = null;
>+        target.ontouchcancel = null;
>+        target.ongesturestart = null;
>+        target.ongesturechange = null;
>+        target.ongestureend = null;
>+        target.onorientationchange = null;
>+      }
>     },
> 
>     _registerFilter : function() {

Flags:

ivan: review+

Actions: View | Diff

Attachments on bug 408803: 231367