summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-09-14 11:16:33 (EDT)
committerStephan Born2012-09-14 11:16:33 (EDT)
commite04eaf348cec6e6e556e6d9303f5e3ad8255c0b1 (patch)
tree86d6eaf3aafd0ad146c918022df7befc05543dcd
parenteb4a95ae72a9270d352992abb7e207a394dd624a (diff)
downloadorg.eclipse.stardust.ui.web-e04eaf348cec6e6e556e6d9303f5e3ad8255c0b1.zip
org.eclipse.stardust.ui.web-e04eaf348cec6e6e556e6d9303f5e3ad8255c0b1.tar.gz
org.eclipse.stardust.ui.web-e04eaf348cec6e6e556e6d9303f5e3ad8255c0b1.tar.bz2
CRNT-26003
1)Made changes in m_connection.js - renamed :: updateAnchorPointForGateway to updateAnchorPointForSymbol, added check for ActivitySymbol git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59239 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js4
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js3
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js2
3 files changed, 5 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 146cfee..888252b 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
@@ -274,9 +274,9 @@ define(
* when connection is created from Flyout Menu, anchor points
* needs to be moved to 6 O'clock or 3 O'clock
*/
- Connection.prototype.updateAnchorPointForGateway = function() {
+ Connection.prototype.updateAnchorPointForSymbol = function() {
var orientation = null;
- if (this.fromAnchorPoint.symbol.type == m_constants.GATEWAY_SYMBOL) {
+ if (this.fromAnchorPoint.symbol.type == m_constants.GATEWAY_SYMBOL || this.fromAnchorPoint.symbol.type == m_constants.ACTIVITY_SYMBOL) {
var startSymbol = this.fromAnchorPoint.symbol;
var targetSymbol = this.toAnchorPoint.symbol;
if (startSymbol.x > targetSymbol.x + targetSymbol.width) {
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 fad5ea6..c9013c3 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
@@ -1328,7 +1328,7 @@ define(
var status = this.placeNewSymbol(x - this.X_OFFSET,
y - this.Y_OFFSET, true);
this.currentConnection.toModelElementOid = this.lastSymbol.oid;
- this.currentConnection.updateAnchorPointForGateway();
+ this.currentConnection.updateAnchorPointForSymbol();
this.currentConnection.complete();
this.currentConnection = null;
} else {
@@ -1512,6 +1512,7 @@ define(
if (this.currentConnection.validateCreateConnection(
this.currentConnection.fromAnchorPoint,
anchorPoint)) {
+ this.currentConnection.updateAnchorPointForSymbol();
this.currentConnection
.setSecondAnchorPoint(anchorPoint);
if (!this.currentConnection.isCompleted()) {
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 64b227d..36e9d78 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
@@ -1144,7 +1144,7 @@ define(
this.diagram.currentConnection.toModelElementOid = this.oid;
this.diagram.currentConnection
- .updateAnchorPointForGateway();
+ .updateAnchorPointForSymbol();
this.diagram.currentConnection.complete();
this.diagram.currentConnection = null;
} else {