CRNT-25149

Added fix to prevent symbol drop in pool and swimlane header.

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@60519 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

1 files changed, 9 insertions, 2 deletions

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 275dcda..4bb3144 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
@@ -1026,7 +1026,6 @@ define(
 				Symbol.prototype.dragStop = function() {

 					if (this.diagram.mode == this.diagram.SYMBOL_MOVE_MODE) {

 						this.diagram.mode = this.diagram.NORMAL_MODE

-						this.diagram.dragEnabled = false;

 						this.showProximitySensor();

 						// Only process if symbol has been moved at all

 						if (this.x != this.dragStartX

@@ -1039,6 +1038,8 @@ define(
 								if (newParentSymbol == null) {

 									this.move(this.dragStartX, this.dragStartY);

 									this.diagram.hideSnapLines(this);

+									m_utils.removeItemFromArray(this.diagram.currentSelection, this);

+									this.deselect();

 									m_messageDisplay

 											.showErrorMessage("Symbol is not contained in Swimlane. Reverting drag.");

 

@@ -1382,7 +1383,13 @@ define(
 												- this.diagram.Y_OFFSET));

 								this.hideAnchorPoints();

 							}

-						} else {

+						} else if (this.diagram.dragEnabled

+								&& -1 == jQuery.inArray(

+										this.diagram.currentSelection, this)) {

+							//When drag/drop fails

+							this.diagram.dragEnabled = false;

+							this.deselect();

+						}else {

 							this.select();

 						}

 					}