Attachment 195873 Details for Bug 346065 – partial fix

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

[patch] partial fix

ComboKeyBug.patch (text/plain), 4.00 KB, created by Tim Buschtoens

on 2011-05-17 11:12:32 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Buschtoens

Created: 2011-05-17 11:12:32 EDT

Size: 4.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt.q07
>Index: js/org/eclipse/swt/widgets/Combo.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/swt/widgets/Combo.js,v
>retrieving revision 1.56
>diff -u -r1.56 Combo.js
>--- js/org/eclipse/swt/widgets/Combo.js	26 Apr 2011 13:31:32 -0000	1.56
>+++ js/org/eclipse/swt/widgets/Combo.js	17 May 2011 15:07:28 -0000
>@@ -308,6 +308,11 @@
>         // Temporary make the text field ReadOnly, when the list is dropped.
>         if( this._editable ) {
>           this._field.setReadOnly( !this._dropped  );
>+          if( !this._dropped ) {
>+            this._field._visualizeBlur();
>+          } else {
>+            this._field._visualizeFocus();
>+          }
>         }
>         if( !this._dropped ) {
>           // Brings this widget on top of the others with same parent.
>@@ -562,8 +567,7 @@
>           }
>           break;
>       }
>-      if(    this._field.isCreated()
>-          && !org.eclipse.swt.EventUtil.getSuspended() ) 
>+      if( this._field.isCreated() && !org.eclipse.swt.EventUtil.getSuspended() )
>       {
>         this._handleSelectionChange();
>       }
>@@ -612,9 +616,7 @@
>           }
>           break;
>       }
>-      if(    this._field.isCreated()
>-          && !org.eclipse.swt.EventUtil.getSuspended() ) 
>-      {
>+      if( this._field.isCreated() && !org.eclipse.swt.EventUtil.getSuspended() ) {
>         this._handleSelectionChange();
>       }
>       if( evt.getCharCode() !== 0 ) {
>#P org.eclipse.rap.rwt.q07.jstest
>Index: js/org/eclipse/rwt/test/tests/ComboTest.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/ComboTest.js,v
>retrieving revision 1.11
>diff -u -r1.11 ComboTest.js
>--- js/org/eclipse/rwt/test/tests/ComboTest.js	26 Apr 2011 13:31:25 -0000	1.11
>+++ js/org/eclipse/rwt/test/tests/ComboTest.js	17 May 2011 15:07:29 -0000
>@@ -144,6 +144,31 @@
>       combo.destroy();
>     },
> 
>+    testTextfieldFocus : function() {
>+      // See Bug 346065 - [Combo] Selection can sometimes not be changed with key up/down in FF4
>+      if( org.eclipse.rwt.Client.isGecko() && org.eclipse.rwt.Client.getVersion() >= 2 ) {
>+        // NOTE: The test is theoratically valid for all browser, but only FF4 has this problem,
>+        //       and document.activeElement is not be available on all browser
>+        var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
>+        var combo = this._createDefaultCombo();
>+        combo.setEditable( true );
>+        assertTrue( combo.isFocusable() );
>+        combo.focus();
>+        testUtil.flush();
>+        assertIdentical( combo._field._inputElement, document.activeElement );
>+        testUtil.click( combo._button );
>+        testUtil.flush();
>+        assertIdentical( document.body, document.activeElement );
>+        testUtil.click( combo._button );
>+        testUtil.flush();
>+        assertIdentical( combo._field._inputElement, document.activeElement );
>+        combo.blur();
>+        testUtil.flush();
>+        assertIdentical( document.body, document.activeElement );
>+        combo.destroy();
>+      }
>+    },
>+
>     testListPopUpBehavior : function() {
>       var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
>       var combo = this._createDefaultCombo();
>@@ -158,7 +183,7 @@
>       assertTrue( combo._list.isSeeable() );
>       combo.destroy();
>     },
>-   
>+
>     testListHeight : function() {
>       var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
>       var combo = this._createDefaultCombo();
>@@ -199,6 +224,7 @@
>     _createDefaultCombo : function() {
>       var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
>       var combo = new org.eclipse.swt.widgets.Combo();
>+      combo.setTabIndex( 1 );
>       combo.setSpace( 239, 81, 6, 23 );
>       combo.setListItemHeight( 19 );
>       combo.setEditable( false );

Flags:

tbuschto: review?

Actions: View | Diff

Attachments on bug 346065: 195873