Attachment 231538 Details for Bug 409124 – Proposed patch

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

[patch] Proposed patch

bug-409124.patch (text/plain), 2.24 KB, created by Ivan Furnadjiev

on 2013-05-27 05:57:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2013-05-27 05:57:01 EDT

Size: 2.24 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.rap.rwt/js/rwt/widgets/Menu.js b/bundles/org.eclipse.rap.rwt/js/rwt/widgets/Menu.js
>index b2b8a3a..54446ed 100644
>--- a/bundles/org.eclipse.rap.rwt/js/rwt/widgets/Menu.js
>+++ b/bundles/org.eclipse.rap.rwt/js/rwt/widgets/Menu.js
>@@ -187,7 +187,11 @@
>         // it is essential that this happens before the menuItem is added
>         menuItem.setParentMenu( this );
>       }
>-      this._layout.addAt( menuItem, index );
>+      var position = index;
>+      if( this._preItem && this._preItem !== menuItem ) {
>+        position++;
>+      }
>+      this._layout.addAt( menuItem, position );
>     },
> 
>     scheduleMenuLayout : function() {
>diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/MenuTest.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/MenuTest.js
>index 7c9d2dc..08d4ec4 100644
>--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/MenuTest.js
>+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/MenuTest.js
>@@ -170,6 +170,20 @@
>       widget.destroy();
>     },
> 
>+    testCreateMenuItemByProtocolAtPosition : function() {
>+      var menu = createPopUpMenuByProtocol( "w3" );
>+      menu.setHasShowListener( true );
>+      menu._menuShown();
>+
>+      createMenuItemByProtocol( "w4", "w3", [ "PUSH" ] );
>+      createMenuItemByProtocol( "w5", "w3", [ "PUSH" ] );
>+      var item = createMenuItemByProtocol( "w6", "w3", [ "PUSH" ], 1 );
>+
>+      assertEquals( 0, menu._layout.indexOf( menu._preItem ) );
>+      assertEquals( 2, menu._layout.indexOf( item ) );
>+      menu.destroy();
>+    },
>+
>     testCreateMenuItemWithMnemonicByProtocol : function() {
>       var menu = createPopUpMenuByProtocol( "w3" );
>       var item = createMenuItemByProtocol( "w4", "w3", [ "PUSH" ] );
>@@ -1833,7 +1847,7 @@
>   return ObjectRegistry.getObject( id );
> };
> 
>-var createMenuItemByProtocol = function( id, parentId, style ) {
>+var createMenuItemByProtocol = function( id, parentId, style, index ) {
>   MessageProcessor.processOperation( {
>     "target" : id,
>     "action" : "create",
>@@ -1841,7 +1855,7 @@
>     "properties" : {
>       "style" : style,
>       "parent" : parentId,
>-      "index" : 0
>+      "index" : index ? index : 0
>     }
>   } );
>   return ObjectRegistry.getObject( id );

Flags:

tbuschto: review+

Actions: View | Diff

Attachments on bug 409124: 231534 | 231538