| author | Sidharth Singh | 2012-09-20 10:28:51 (EDT) |
|---|---|---|
| committer | Stephan Born | 2012-09-20 10:28:51 (EDT) |
| commit | f3f8120025aabe48cb9dddf4bbfd9b134b29eec2 (patch) (side-by-side diff) | |
| tree | 41e2a9c691dc882a851707eccca95c267b483408 | |
| parent | 27cd920769ef0abaa8361ee1a039946f8ec3fb37 (diff) | |
| download | org.eclipse.stardust.ui.web-f3f8120025aabe48cb9dddf4bbfd9b134b29eec2.zip org.eclipse.stardust.ui.web-f3f8120025aabe48cb9dddf4bbfd9b134b29eec2.tar.gz org.eclipse.stardust.ui.web-f3f8120025aabe48cb9dddf4bbfd9b134b29eec2.tar.bz2 | |
CRNT-26159
Added check in showFlyOutMenu to avoid setting this.diagram.currentFlyOutSymbol for Pool and swimlanes
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59398 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
| -rw-r--r-- | web-modeler/src/main/resources/META-INF/xhtml/js/m_drawable.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_drawable.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_drawable.js index 991e922..915b3d8 100644 --- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_drawable.js +++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_drawable.js @@ -280,8 +280,14 @@ define( Drawable.prototype.showFlyOutMenu = function() {
if (this.diagram.currentFlyOutSymbol) {
return;
+ } else if (this.type
+ && (this.type.toLowerCase().indexOf(
+ m_constants.POOL_SYMBOL.toLowerCase()) > 0 || this.type == m_constants.SWIMLANE_SYMBOL)) {
+ // do nothing
+ } else {
+ this.diagram.currentFlyOutSymbol = this;
}
- this.diagram.currentFlyOutSymbol = this;
+
this.flyOutMenuBackground.show();
this.flyOutMenuBackground.animate({
"fill-opacity" : FLY_OUT_MENU_END_OPACITY
|