summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-11-22 05:40:29 (EST)
committerSven Rottstock2012-11-22 05:40:29 (EST)
commit6cbfd57dc62d2b548c410bbd6955f17df4abc35b (patch)
tree9b3279c36ad2311218b0247ec29ca2991d6d2802
parentc01325cb20051cbc560c993dee5a1039aaac8941 (diff)
downloadorg.eclipse.stardust.ui.web-6cbfd57dc62d2b548c410bbd6955f17df4abc35b.zip
org.eclipse.stardust.ui.web-6cbfd57dc62d2b548c410bbd6955f17df4abc35b.tar.gz
org.eclipse.stardust.ui.web-6cbfd57dc62d2b548c410bbd6955f17df4abc35b.tar.bz2
CRNT-25840
Made changes to remove the currentConnection from symbol on hoverOut Added check in m_connection.js validateCreateConnection for SwimlaneSymbol and poolSymbol git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@61024 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js5
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js6
2 files changed, 8 insertions, 3 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 abdf166..8e8b237 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
@@ -1762,7 +1762,7 @@ define(
//It may not be removed when connection is disengaged(canvas click)
//if connection is removed , but symbol contains the connection remove It.
var symbol = this.diagram
- .findSymbolByGuid(this.toModelElementOid)
+ .findSymbolByGuid(this.toModelElementOid,this.diagram.model.id)
if (null != symbol) {
m_utils.removeItemFromArray(symbol.connections,
this);
@@ -1936,7 +1936,10 @@ define(
.showErrorMessage("No more connections allowed to this activity.");
return false;
}
+ }else if(toAnchorPoint.symbol.isPoolSymbol() || toAnchorPoint.symbol.type == m_constants.SWIMLANE_SYMBOL){
+ return false;
}
+
// If Start and End symbol are same, show error
if (fromAnchorPoint.symbol.oid != null
&& fromAnchorPoint.symbol.oid == toAnchorPoint.symbol.oid) {
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 29c48db..f44fa1e 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
@@ -1145,7 +1145,8 @@ define(
this.showFlyOutMenu();
}
} else {
- if (this.validateCreateConnection()) {
+ if (this.diagram.isInConnectionMode()
+ && this.validateCreateConnection()) {
this.showAnchorPoints();
}
}
@@ -1339,10 +1340,11 @@ define(
if (this.diagram.isInConnectionMode()) {
if (null != this.diagram.currentConnection
&& this.diagram.currentConnection.isPrepared()) {
+ m_utils.removeItemFromArray(
+ this.connections, this.diagram.currentConnection);
this.diagram.currentConnection
.setDummySecondAnchorPoint();
}
-
this.hideAnchorPoints();
} else {
this.showDefaultCursor();