Attachment 205476 Details for Bug 361225 – Proposed patch

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

[patch] Proposed patch

Bug-361225.patch (text/plain), 4.27 KB, created by Ivan Furnadjiev

on 2011-10-19 02:49:54 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2011-10-19 02:49:54 EDT

Size: 4.27 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: js/org/eclipse/rwt/KeyEventUtil.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/js/org/eclipse/rwt/KeyEventUtil.js,v
>retrieving revision 1.1
>diff -u -r1.1 KeyEventUtil.js
>--- js/org/eclipse/rwt/KeyEventUtil.js	7 Jul 2011 11:22:20 -0000	1.1
>+++ js/org/eclipse/rwt/KeyEventUtil.js	19 Oct 2011 06:30:52 -0000
>@@ -1,11 +1,12 @@
> /*******************************************************************************
>- * Copyright (c) 2009, 2011 EclipseSource and others. All rights reserved.
>- * This program and the accompanying materials are made available under the
>- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
>- * and is available at http://www.eclipse.org/legal/epl-v10.html
>+ * Copyright (c) 2009, 2011 EclipseSource and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>  *
>  * Contributors:
>- *   EclipseSource - initial API and implementation
>+ *    EclipseSource - initial API and implementation
>  ******************************************************************************/
> 
> qx.Class.define( "org.eclipse.rwt.KeyEventUtil", {
>@@ -93,23 +94,7 @@
>     },
>     
>     _isRelevantEvent : function( eventType, keyCode ) {
>-      var result;
>-      if( qx.core.Variant.isSet( "qx.client", "mshtml" ) ) {
>-        // TODO [tb] : is the browser-switch still relevant?
>-        var keyEventHandler = org.eclipse.rwt.EventHandlerUtil;
>-        var nonPrintable  =    keyEventHandler._isNonPrintableKeyCode( keyCode )
>-                            || keyCode == 27 // escape
>-                            || keyCode == 8  // backspace
>-                            || keyCode == 9; // tab
>-        if( nonPrintable ) {
>-          result = eventType === "keydown";
>-        } else {
>-          result = eventType === "keypress";
>-        }
>-      } else {
>-        result = eventType === "keypress";
>-      }
>-      return result;
>+      return eventType === "keypress";
>     },
> 
>     _getTargetControl : function() {
>Index: js/org/eclipse/rwt/SyncKeyEventUtil.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/js/org/eclipse/rwt/SyncKeyEventUtil.js,v
>retrieving revision 1.1
>diff -u -r1.1 SyncKeyEventUtil.js
>--- js/org/eclipse/rwt/SyncKeyEventUtil.js	7 Jul 2011 11:22:23 -0000	1.1
>+++ js/org/eclipse/rwt/SyncKeyEventUtil.js	19 Oct 2011 06:30:52 -0000
>@@ -1,13 +1,13 @@
> /*******************************************************************************
>- * Copyright (c) 2008, 2010 Innoopract Informationssysteme GmbH.
>+ * Copyright (c) 2008, 2011 Innoopract Informationssysteme GmbH and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>  * Contributors:
>- *     Innoopract Informationssysteme GmbH - initial API and implementation
>- *     EclipseSource - ongoing development
>+ *    Innoopract Informationssysteme GmbH - initial API and implementation
>+ *    EclipseSource - ongoing development
>  ******************************************************************************/
> 
> qx.Class.define( "org.eclipse.rwt.SyncKeyEventUtil",
>@@ -22,6 +22,7 @@
>   
>   members : {
>     intercept : function( eventType, keyCode, charCode, domEvent ) {
>+      this._cancelEvent = false;
>       // [if] Fix for bug 319159
>       var keyUtil = org.eclipse.rwt.KeyEventUtil.getInstance();
>       var realKeyCode = this._getRealKeyCode( keyCode, domEvent );
>@@ -37,7 +38,6 @@
>         if( hasKeyListener || ( hasTraverseListener && isTraverseKey ) ) {
>           // [if] Don't keep and modify the pending event object outside the
>           // "intercept" method. Such approach does not work in IE.
>-          this._cancelEvent = false;
>           this._sendKeyDown( control, realKeyCode, charCode, domEvent );
>           if( this._cancelEvent ) {
>             this._cancelDomEvent( domEvent );

Flags:

ivan: review?
tbuschto: review+

Actions: View | Diff

Attachments on bug 361225: 205476