summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-09-21 02:57:33 (EDT)
committer Stephan Born2012-09-21 02:57:33 (EDT)
commitd0a8e3433a5bb45201f8de4538481c51e35a6475 (patch)
tree32a56412a1eb38c8b790357b95624486b44a142e
parent9ba1166a6124edb5a43367d155d735484d7f146b (diff)
downloadorg.eclipse.stardust.ui.web-d0a8e3433a5bb45201f8de4538481c51e35a6475.zip
org.eclipse.stardust.ui.web-d0a8e3433a5bb45201f8de4538481c51e35a6475.tar.gz
org.eclipse.stardust.ui.web-d0a8e3433a5bb45201f8de4538481c51e35a6475.tar.bz2
CRNT-26159
Added code in m_diagram.js to reset currentFlyOutSymbol on clearCurrentToolSelection Added check for this.diagram.currentSelection in validateProximity in m_symbol.js git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59404 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js2
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js31
2 files changed, 18 insertions, 15 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 85dcf0b..dbfcaf3 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
@@ -1521,7 +1521,7 @@ define(
Diagram.prototype.clearCurrentSelection = function() {
this.deselectCurrentSelection();
this.currentSelection = [];
-
+ this.currentFlyOutSymbol = null;
this.showProcessPropertiesPanel();
};
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 ab55a71..87e65b1 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
@@ -1014,7 +1014,7 @@ define(
try {
// while in connection mode/or symbol is Pool/swimlane ,
// flyout menu can disappear
- if ((this.diagram.mode == this.diagram.CONNECTION_MODE || this.diagram.currentConnection != null)
+ if ((this.diagram.mode == this.diagram.CONNECTION_MODE || this.diagram.currentConnection != null || this.diagram.currentSelection.length > 0)
|| this.type == null
|| (this.type && (this.type.toLowerCase()
.indexOf(
@@ -1949,9 +1949,23 @@ define(
} else {
var newConnection = null;
+ var fromAnchorPoint =this.dragConnection.fromAnchorPoint;
+ var toAnchorPoint =this.dragConnection.toAnchorPoint;
+ // Reset the original Anchor Point in dragConnection
+ // for deletion
+ if (this.dragConnection.originalFromAnchorPoint) {
+ this.dragConnection.fromAnchorPoint = this.dragConnection.originalFromAnchorPoint;
+ this.dragConnection.originalFromAnchorPoint = null;
+ } else if (this.dragConnection.originalToAnchorPoint) {
+ this.dragConnection.toAnchorPoint = this.dragConnection.originalToAnchorPoint;
+ this.dragConnection.originalToAnchorPoint = null;
+ }
+
+ this.dragConnection.createDeleteCommand(true);
+
if (this.direction == m_constants.TO_ANCHOR_POINT) {
newConnection = this.symbol.diagram
- .createConnection(this.dragConnection.fromAnchorPoint);
+ .createConnection(fromAnchorPoint);
newConnection.setSecondAnchorPoint(anchorPoint,
true);
} else {
@@ -1959,21 +1973,10 @@ define(
.createConnection(anchorPoint);
newConnection
.setSecondAnchorPoint(
- this.dragConnection.toAnchorPoint,
+ toAnchorPoint,
true);
}
- // Reset the original Anchor Point in dragConnection
- // for deletion
- if (this.dragConnection.originalFromAnchorPoint) {
- this.dragConnection.fromAnchorPoint = this.dragConnection.originalFromAnchorPoint;
- this.dragConnection.originalFromAnchorPoint = null;
- } else if (this.dragConnection.originalToAnchorPoint) {
- this.dragConnection.toAnchorPoint = this.dragConnection.originalToAnchorPoint;
- this.dragConnection.originalToAnchorPoint = null;
- }
-
- this.dragConnection.createDeleteCommand(true);
this.dragConnection = newConnection;
}
} else {