Attachment 147411 Details for Bug 289398 – Proposed patch - new version

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

[patch] Proposed patch - new version

Bug289398-patch.txt (text/plain), 4.09 KB, created by Asen Draganov

on 2009-09-17 04:44:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Asen Draganov

Created: 2009-09-17 04:44:00 EDT

Size: 4.09 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.32
>diff -u -r1.32 Combo.js
>--- js/org/eclipse/swt/widgets/Combo.js	16 Sep 2009 09:37:47 -0000	1.32
>+++ js/org/eclipse/swt/widgets/Combo.js	17 Sep 2009 08:44:20 -0000
>@@ -345,7 +345,7 @@
>       }
>     },
>    
>-    _setSelected : function( value ) {
>+    _setSelected : function( value, serverSelected ) {
>       this._selected = value;
>       this._manager.setLeadItem( value );
>       this._manager.setAnchorItem( value );
>@@ -353,7 +353,9 @@
>         var fieldValue = value.getLabel().toString();
>         this._field.setValue( this._formatText( fieldValue ) );
>         if( this._field.isCreated() ) {
>-          this._field.selectAll();
>+          if( !serverSelected ) {
>+            this._field.selectAll();
>+          }
>           if( !org_eclipse_rap_rwt_EventUtil_suspend ) {
>             this._handleSelectionChange();
>           }
>@@ -417,7 +419,7 @@
>         {
>           this._list._onmousedown( evt );
>           this._toggleListVisibility();
>-          this._setSelected( this._manager.getSelectedItem() );
>+          this._setSelected( this._manager.getSelectedItem(), false );
>           this.setFocused( true );
>         // Click is on the combo's button or outside the dropped combo
>         } else if(    target == this._button
>@@ -455,10 +457,10 @@
>             toSelect = this._manager.getPrevious( isSelected );
>           }
>           if( toSelect ) {
>-            this._setSelected( toSelect );
>+            this._setSelected( toSelect, false );
>           }
>         } else if( this._list.getChildrenLength() ) {
>-          this._setSelected( this._list.getChildren()[0] );
>+          this._setSelected( this._list.getChildren()[0], false );
>         }
>       }
>     },
>@@ -490,7 +492,7 @@
>         case "Enter":
>           if( this._dropped ) {
>             this._toggleListVisibility();
>-            this._setSelected( this._manager.getSelectedItem() );
>+            this._setSelected( this._manager.getSelectedItem(), false );
>           } else if(    !evt.isShiftPressed()
>                      && !evt.isAltPressed()
>                      && !evt.isCtrlPressed()
>@@ -539,7 +541,7 @@
>                            ? this._manager.getNext( this._selected )
>                            : this._manager.getFirst();
>             if( toSelect ) {
>-              this._setSelected( toSelect );
>+              this._setSelected( toSelect, false );
>             }
>           }
>           break;
>@@ -549,7 +551,7 @@
>                            ? this._manager.getPrevious( this._selected )
>                            : this._manager.getLast();
>             if( toSelect ) {
>-              this._setSelected( toSelect );
>+              this._setSelected( toSelect, false );
>             }
>           }
>           break;
>@@ -560,9 +562,9 @@
>           if( this._selected ) {
>             this._list._onkeypress( evt );
>             var selected = this._manager.getSelectedItem();
>-            this._setSelected( selected );
>+            this._setSelected( selected, false );
>           } else if( this._list.getChildrenLength() ) {
>-            this._setSelected( this._list.getChildren()[0] );
>+            this._setSelected( this._list.getChildren()[0], false );
>           }
>           break;
>         default:
>@@ -596,7 +598,7 @@
>       if( this._dropped && !evt.isAltPressed() && !evt.isCtrlPressed() ) {
>         this._list._onkeyinput( evt );
>         var selected = this._manager.getSelectedItem();
>-        this._setSelected( selected );
>+        this._setSelected( selected, false );
>       }
>     },
>     
>@@ -746,7 +748,7 @@
>       if( index >= 0 && index <= items.length - 1 ) {
>         item = items[ index ];
>       }
>-      this._setSelected( item );
>+      this._setSelected( item, true );
>     },
> 
>     setEditable : function( value ) {

Actions: View | Diff

Attachments on bug 289398: 147143 | 147145 | 147300 | 147411