summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-08-31 08:32:20 (EDT)
committer Stephan Born2012-08-31 08:32:20 (EDT)
commitc747349bb286b49d05170fc27c49b585087a6ef3 (patch)
tree3f33b877a03220dcb814631bf6cb9defc2ab857d
parentf592468ca76f55bd6706592cf7dba6382207c0ee (diff)
downloadorg.eclipse.stardust.ui.web-c747349bb286b49d05170fc27c49b585087a6ef3.zip
org.eclipse.stardust.ui.web-c747349bb286b49d05170fc27c49b585087a6ef3.tar.gz
org.eclipse.stardust.ui.web-c747349bb286b49d05170fc27c49b585087a6ef3.tar.bz2
CRNT-25577
Added check if modelElement is present before setting connectionType git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58848 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js18
1 files changed, 13 insertions, 5 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 c906db5..ede55e5 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
@@ -267,7 +267,7 @@ define(
/**
* when connection is created from Flyout Menu, anchor points
- * needs to be moved to 6 O’clock or 3 O'clock
+ * needs to be moved to 6 O'clock or 3 O'clock
*/
Connection.prototype.updateAnchorPointForGateway = function() {
var orientation = null;
@@ -321,12 +321,16 @@ define(
this.fromModelElementOid = this.fromAnchorPoint.symbol.oid;
this.fromModelElementType = m_constants.DATA;
this.toModelElementOid = this.toAnchorPoint.symbol.oid;
- this.toModelElementType = this.toAnchorPoint.symbol.modelElement.type;
+ if (this.toAnchorPoint.symbol.modelElement) {
+ this.toModelElementType = this.toAnchorPoint.symbol.modelElement.type;
+ }
data = this.fromAnchorPoint.symbol.modelElement;
activity = this.toAnchorPoint.symbol.modelElement;
} else {
this.fromModelElementOid = this.fromAnchorPoint.symbol.oid;
- this.fromModelElementType = this.fromAnchorPoint.symbol.modelElement.type;
+ if(this.fromAnchorPoint.symbol.modelElement){
+ this.fromModelElementType = this.fromAnchorPoint.symbol.modelElement.type;
+ }
this.toModelElementOid = this.toAnchorPoint.symbol.oid;
this.toModelElementType = m_constants.DATA;
data = this.toAnchorPoint.symbol.modelElement;
@@ -340,9 +344,13 @@ define(
.getInstance();
} else {
this.fromModelElementOid = this.fromAnchorPoint.symbol.oid;
- this.fromModelElementType = this.fromAnchorPoint.symbol.modelElement.type;
+ if(this.fromAnchorPoint.symbol.modelElement){
+ this.fromModelElementType = this.fromAnchorPoint.symbol.modelElement.type;
+ }
this.toModelElementOid = this.toAnchorPoint.symbol.oid;
- this.toModelElementType = this.toAnchorPoint.symbol.modelElement.type;
+ if (this.toAnchorPoint.symbol.modelElement) {
+ this.toModelElementType = this.toAnchorPoint.symbol.modelElement.type;
+ }
this.modelElement = m_controlFlow
.createControlFlow(this.diagram.process);