summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-09-28 03:54:17 (EDT)
committer Stephan Born2012-09-28 03:54:17 (EDT)
commit9bf18fd5a15572a9aeeb51367e060901d5132086 (patch)
treebbaa4102fab2233160b96312c6305f14138206aa
parentcb01d72983ee11b62ad8f2fa7e7e3b964f36afdc (diff)
downloadorg.eclipse.stardust.ui.web-9bf18fd5a15572a9aeeb51367e060901d5132086.zip
org.eclipse.stardust.ui.web-9bf18fd5a15572a9aeeb51367e060901d5132086.tar.gz
org.eclipse.stardust.ui.web-9bf18fd5a15572a9aeeb51367e060901d5132086.tar.bz2
CRNT-26396
1)Added a check in m_symbol.js proximityHoverIn() to identify if other symbol is hoverIn() HoverOut them. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59605 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js10
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js10
2 files changed, 19 insertions, 1 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js
index 00982a6..c921906 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js
@@ -1508,6 +1508,16 @@ define(
event.pageY - this.diagram.Y_OFFSET -FLYOUT_MENU_LOC_OFFSET
+ scrollPos.top
, 60, 30);
+ // If connection hoverIn is called before other symbol
+ // hoverOut, manual HoverOut is required.
+ if (this.diagram.currentFlyOutSymbol
+ && this.diagram.currentFlyOutSymbol.oid != this.oid) {
+ if (!this.diagram.currentFlyOutSymbol
+ .validateProximity(event)) {
+ this.diagram.currentFlyOutSymbol
+ .hideFlyOutMenu();
+ }
+ }
this.showFlyOutMenu();
}
};
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 6d62a92..2c90ec7 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
@@ -988,8 +988,16 @@ define(
/**
*
*/
- Symbol.prototype.proximityHoverIn = function() {
+ Symbol.prototype.proximityHoverIn = function(event) {
if (this.diagram.mode == this.diagram.NORMAL_MODE) {
+ // If this symbol hoverIn is called before other symbol
+ // hoverOut, manual HoverOut is required.
+ if (this.diagram.currentFlyOutSymbol
+ && this.diagram.currentFlyOutSymbol.oid != this.oid) {
+ if(!this.diagram.currentFlyOutSymbol.validateProximity(event)){
+ this.diagram.currentFlyOutSymbol.hideFlyOutMenu();
+ }
+ }
if (!this.selected) {
this.showFlyOutMenu();
}