Fix a JS crash when Combo has TabFolder as a parent
Combo list is created when there is a valid "parent" set. In case of
TabFolder, "parent" is not set directly like in other widgets, but when
"control" property on the TabItem is set.
Ensure that "applyObjectId" does not crash when list is not yet created.
Change-Id: If8e01a76e89579eb66b1f705a02e072924148e3c
diff --git a/bundles/org.eclipse.rap.rwt/js/rwt/widgets/Combo.js b/bundles/org.eclipse.rap.rwt/js/rwt/widgets/Combo.js
index 7b1c3b7..2a91e37 100755
--- a/bundles/org.eclipse.rap.rwt/js/rwt/widgets/Combo.js
+++ b/bundles/org.eclipse.rap.rwt/js/rwt/widgets/Combo.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2015 EclipseSource and others.
+ * Copyright (c) 2009, 2020 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
@@ -148,6 +148,10 @@
this._list.addListener( "Selection", function( event ) {
that._onListSelectionChanged( event );
} );
+ var id = this.getHtmlAttribute( "id" );
+ if( id ) {
+ this._list.applyObjectId( id + "-listbox" );
+ }
}
},
@@ -436,7 +440,9 @@
applyObjectId : function( id ) {
this.base( arguments, id );
- this._list.applyObjectId( id + "-listbox" );
+ if( this._list ) {
+ this._list.applyObjectId( id + "-listbox" );
+ }
}
}
