summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-08-24 08:36:22 (EDT)
committer Stephan Born2012-08-24 08:36:22 (EDT)
commitb529c535554a386b4fc6cddc67eac4d16b700ab5 (patch)
tree73b95513a0c04ce19a02cd4515d03a22f0cef7eb
parent7ca2adb4f5249dba0f08e06e8fc17ecda7f9065f (diff)
downloadorg.eclipse.stardust.ui.web-b529c535554a386b4fc6cddc67eac4d16b700ab5.zip
org.eclipse.stardust.ui.web-b529c535554a386b4fc6cddc67eac4d16b700ab5.tar.gz
org.eclipse.stardust.ui.web-b529c535554a386b4fc6cddc67eac4d16b700ab5.tar.bz2
CRNT-25845
1)Added code for handling page scroll in flyout menu. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58682 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js12
1 files changed, 8 insertions, 4 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 3fb736c..5a0c106 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
@@ -7,12 +7,13 @@ define(
"m_propertiesPanel", "m_dataFlowPropertiesPanel",
"m_controlFlowPropertiesPanel", "m_activitySymbol",
"m_gatewaySymbol", "m_eventSymbol", "m_controlFlow",
- "m_dataFlow" ],
+ "m_dataFlow", "m_modelerUtils" ],
function(m_utils, m_constants, m_canvasManager, m_drawable,
m_commandsController, m_command, m_controlFlow,
m_propertiesPanel, m_dataFlowPropertiesPanel,
m_controlFlowPropertiesPanel, m_activitySymbol,
- m_gatewaySymbol, m_eventSymbol, m_controlFlow, m_dataFlow) {
+ m_gatewaySymbol, m_eventSymbol, m_controlFlow, m_dataFlow,
+ m_modelerUtils) {
return {
createConnection : function(diagram, fromAnchorPoint) {
@@ -1140,9 +1141,12 @@ define(
*/
Connection.prototype.proximityHoverIn = function(event) {
if (this.diagram.isInNormalMode()) {
+ var scrollPos = m_modelerUtils.getModelerScrollPosition();
+
this.adjustFlyOutMenu(event.pageX
- - this.diagram.X_OFFSET - 5, event.pageY
- - this.diagram.Y_OFFSET - 5, 40, 20);
+ - this.diagram.X_OFFSET + scrollPos.left - 5,
+ event.pageY - this.diagram.Y_OFFSET
+ + scrollPos.top - 5, 40, 20);
this.showFlyOutMenu();
}
};