summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-09-24 02:27:00 (EDT)
committerStephan Born2012-09-24 02:27:00 (EDT)
commit92597bf22f4e3223e1e2cdb61684c394d255a851 (patch)
treeafcbacda15f86553c5cf427f33ec39e4e17c09d6
parent59448b5a5104837f04babf2fb104b0b99b7f807b (diff)
downloadorg.eclipse.stardust.ui.web-92597bf22f4e3223e1e2cdb61684c394d255a851.zip
org.eclipse.stardust.ui.web-92597bf22f4e3223e1e2cdb61684c394d255a851.tar.gz
org.eclipse.stardust.ui.web-92597bf22f4e3223e1e2cdb61684c394d255a851.tar.bz2
CRNT-26159
Used symbols proximitySensor object to identify proximity margin for HoverOut. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59436 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js27
1 files changed, 11 insertions, 16 deletions
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 e3e5b72..58aacdc 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
@@ -1017,7 +1017,8 @@ define(
// while in connection mode/or symbol is Pool/swimlane ,
// or in Drag and Drop mode flyout menu should disappear
if ((this.diagram.mode == this.diagram.CONNECTION_MODE
- || this.diagram.currentConnection != null || this.diagram.currentSelection.length > 0 || this.diagram.newSymbol)
+ || this.diagram.currentConnection != null
+ || this.diagram.currentSelection.length > 0 || this.diagram.newSymbol)
|| this.diagram.dragEnabled
|| this.type == null
|| (this.type && (this.type.toLowerCase()
@@ -1034,21 +1035,15 @@ define(
var yPos = event.pageY - this.diagram.Y_OFFSET
+ scrollPos.top;
- var proximityMargin = m_constants.PROXIMITY_SENSOR_MARGIN;
- // symbol x co-ord , width and proximity width will give
- // the right proximity margin
- var rightProximityMargin = this.x + this.width
- + proximityMargin + scrollPos.left;
- // symbol x co-ord minus proximity width will give the
- // left proximity margin
- var leftProximityMargin = this.x - proximityMargin;
- // symbol y co-ord minus proximity width will
- // give the top proximity margin
- var topProximityMargin = this.y - proximityMargin;
- // symbol y co-ord , height,proximity width will give
- // the bottom proximity margin
- var bottomProximityMargin = this.y + this.height
- + proximityMargin;
+ var rightProximityMargin = this.proximitySensor
+ .attr('x')
+ + this.proximitySensor.attr('width');
+ var leftProximityMargin = this.proximitySensor
+ .attr('x');
+ var topProximityMargin = this.proximitySensor.attr('y');
+ var bottomProximityMargin = this.proximitySensor
+ .attr('y')
+ + this.proximitySensor.attr('height');
if ((xPos <= rightProximityMargin && xPos >= leftProximityMargin)
&& (yPos <= bottomProximityMargin && yPos >= topProximityMargin)) {