summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-09-21 02:00:50 (EDT)
committerStephan Born2012-09-21 02:00:50 (EDT)
commit821fc0fce2b4952941a871c549c154434780d356 (patch)
treeeea188e06bb12f766ca2998cc38554a4c5fd2f47
parent329444835d21ec854dfeb3514d4be5ace754ccfa (diff)
downloadorg.eclipse.stardust.ui.web-821fc0fce2b4952941a871c549c154434780d356.zip
org.eclipse.stardust.ui.web-821fc0fce2b4952941a871c549c154434780d356.tar.gz
org.eclipse.stardust.ui.web-821fc0fce2b4952941a871c549c154434780d356.tar.bz2
CRNT-26159
Added check in validateProximity to hoverOut for Pool,swimlane without checking proximitySensor condition. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59402 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_drawable.js2
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js5
2 files changed, 5 insertions, 2 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 915b3d8..ff19189 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
@@ -282,7 +282,7 @@ define(
return;
} else if (this.type
&& (this.type.toLowerCase().indexOf(
- m_constants.POOL_SYMBOL.toLowerCase()) > 0 || this.type == m_constants.SWIMLANE_SYMBOL)) {
+ m_constants.POOL_SYMBOL.toLowerCase()) > -1 || this.type == m_constants.SWIMLANE_SYMBOL)) {
// do nothing
} else {
this.diagram.currentFlyOutSymbol = this;
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js
index 0a6969c..ab55a71 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js
@@ -1016,7 +1016,10 @@ define(
// flyout menu can disappear
if ((this.diagram.mode == this.diagram.CONNECTION_MODE || this.diagram.currentConnection != null)
|| this.type == null
- || (this.type && (this.type == m_constants.POOL_SYMBOL || this.type == m_constants.SWIMLANE_SYMBOL))) {
+ || (this.type && (this.type.toLowerCase()
+ .indexOf(
+ m_constants.POOL_SYMBOL
+ .toLowerCase()) > -1 || this.type == m_constants.SWIMLANE_SYMBOL))) {
return false;
}