summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-08-24 03:30:48 (EDT)
committerStephan Born2012-08-24 03:30:48 (EDT)
commit721bd42f8cbfe3063c00c44d84df8981a2cfb8ca (patch)
treed34687d9b484ac80dddf073cccc5941f754b0a67
parentbda6f99e4637577ff5856f5351d8650d12b2bf68 (diff)
downloadorg.eclipse.stardust.ui.web-721bd42f8cbfe3063c00c44d84df8981a2cfb8ca.zip
org.eclipse.stardust.ui.web-721bd42f8cbfe3063c00c44d84df8981a2cfb8ca.tar.gz
org.eclipse.stardust.ui.web-721bd42f8cbfe3063c00c44d84df8981a2cfb8ca.tar.bz2
CRNT-25121
1)Added scroll handling in editable textbox for ActivityName in m_diagram.js git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58660 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js11
1 files changed, 7 insertions, 4 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js
index 7b92167..97f71a6 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js
@@ -18,7 +18,8 @@ define(
"m_activityPropertiesPanel", "m_dataPropertiesPanel",
"m_eventPropertiesPanel", "m_gatewayPropertiesPanel",
"m_swimlanePropertiesPanel", "m_controlFlowPropertiesPanel",
- "m_dataFlowPropertiesPanel", "m_model", "m_process", "m_data" ],
+ "m_dataFlowPropertiesPanel", "m_model", "m_process", "m_data",
+ "m_modelerUtils" ],
function(m_utils, m_constants, m_extensionManager, m_urlUtils,
m_communicationController, m_commandsController, m_command,
m_canvasManager, m_messageDisplay, m_symbol, m_poolSymbol,
@@ -27,7 +28,8 @@ define(
m_activityPropertiesPanel, m_dataPropertiesPanel,
m_eventPropertiesPanel, m_gatewayPropertiesPanel,
m_swimlanePropertiesPanel, m_controlFlowPropertiesPanel,
- m_dataFlowPropertiesPanel, m_model, m_process, m_data) {
+ m_dataFlowPropertiesPanel, m_model, m_process, m_data,
+ m_modelerUtils) {
var X_OFFSET = 7; // Set fpr #panningSensor
var Y_OFFSET = 115; // Set for #toolbar + #messageDisplay
@@ -1445,6 +1447,7 @@ define(
*/
Diagram.prototype.showEditable = function(textPrimitive) {
this.currentTextPrimitive = textPrimitive;
+ var scrollPos = m_modelerUtils.getModelerScrollPosition();
// Use the Symbol's x co-ordinate to decide the width of
// textbox
var textboxWidth = textPrimitive.auxiliaryProperties.callbackScope.width
@@ -1458,9 +1461,9 @@ define(
.moveDiv(
{
"x" : textPrimitive.auxiliaryProperties.callbackScope.x
- + X_OFFSET + 27,
+ + X_OFFSET + 27 - scrollPos.left,
"y" : textPrimitive.auxiliaryProperties.callbackScope.y
- + Y_OFFSET - 5
+ + Y_OFFSET - 5 -scrollPos.top
}).show().trigger("dblclick");
this.symbolEditMode = true;
m_utils.debug("editable activated");