Attachment 206134 Details for Bug 361051 – refised fix

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

[patch] refised fix

WebkitTextFix3.patch (text/plain), 2.90 KB, created by Tim Buschtoens

on 2011-10-28 10:17:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Buschtoens

Created: 2011-10-28 10:17:43 EDT

Size: 2.90 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: js/org/eclipse/rwt/widgets/Text.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/js/org/eclipse/rwt/widgets/Text.js,v
>retrieving revision 1.4
>diff -u -r1.4 Text.js
>--- js/org/eclipse/rwt/widgets/Text.js	16 Sep 2011 12:32:24 -0000	1.4
>+++ js/org/eclipse/rwt/widgets/Text.js	28 Oct 2011 14:15:08 -0000
>@@ -53,6 +53,12 @@
>       this._inputElement.style.paddingRight = "1px";
>     },
> 
>+    _webkitMultilineFix : function() {
>+      if( this._inputTag !== "textarea" ) {
>+        this.base( arguments );
>+      }
>+    },
>+
>     _applyWrap : function( value, oldValue ) {
>       if( this._inputTag == "textarea" ) {
>         this._styleWrap();
>Index: js/org/eclipse/swt/widgets/Combo.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/js/org/eclipse/swt/widgets/Combo.js,v
>retrieving revision 1.11
>diff -u -r1.11 Combo.js
>--- js/org/eclipse/swt/widgets/Combo.js	27 Oct 2011 23:10:33 -0000	1.11
>+++ js/org/eclipse/swt/widgets/Combo.js	28 Oct 2011 14:15:10 -0000
>@@ -545,6 +545,7 @@
>           }
>           this.setFocused( true );
>           evt.stopPropagation();
>+          evt.preventDefault();
>           break;
>         case "Escape":
>           if( this._dropped ) {
>@@ -609,6 +610,9 @@
>             }
>           }
>           break;
>+        case "Enter":
>+          evt.preventDefault();
>+        break;
>       }
>       if( this._field.isCreated() && !org.eclipse.swt.EventUtil.getSuspended() ) {
>         this._handleSelectionChange();
>Index: js/qx/ui/form/TextField.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/js/qx/ui/form/TextField.js,v
>retrieving revision 1.5
>diff -u -r1.5 TextField.js
>--- js/qx/ui/form/TextField.js	25 Oct 2011 10:05:20 -0000	1.5
>+++ js/qx/ui/form/TextField.js	28 Oct 2011 14:15:10 -0000
>@@ -358,12 +358,27 @@
>         } else {
>           inp.addEventListener("input", this.__oninput, false);
>         }
>+        
>+        if (qx.core.Variant.isSet( "qx.client", "webkit" ) ) {
>+          this._webkitMultilineFix();
>+        }
> 
>         // TODO [tb] : write test:
>         this._getTargetNode().appendChild( inp );
>       }
>     },
>+    
>+    _webkitMultilineFix : function(){
>+      this.addEventListener( "keydown", this._preventEnter, this );
>+      this.addEventListener( "keypress", this._preventEnter, this );
>+      this.addEventListener( "keyup", this._preventEnter, this );
>+    },
> 
>+    _preventEnter : function( event ) {
>+      if( event.getKeyIdentifier() === "Enter" ) {
>+        event.preventDefault();
>+      }
>+    },
> 
>     /**
>      * We could not use width/height = 100% because the outer elements

Actions: View | Diff

Attachments on bug 361051: 206123 | 206125 | 206134