CRNT-26663

Made changes in hideConnections in m_symbol.js for min-max lane function


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

2 files changed, 9 insertions, 3 deletions

diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_poolSymbol.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_poolSymbol.js
index 06a6de2..05a3a6c 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_poolSymbol.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_poolSymbol.js
@@ -419,12 +419,12 @@ define(
 								// Move the lane to left when adjacent lane is

 								// minimized

 								this.laneSymbols[n].moveBy(

-										-this.laneSymbols[n].symbolXOffset, 0);

+										-(currentLane.cacheWidth - currentLane.width), 0);

 								// Move the contained symbols

 								for ( var c in this.laneSymbols[n].containedSymbols) {

 									this.laneSymbols[n].containedSymbols[c]

 											.moveBy(

-													-this.laneSymbols[n].symbolXOffset,

+													-(currentLane.cacheWidth - currentLane.width),

 													0);

 								}

 							} else {

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 4bb3144..398bc7f 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
@@ -434,9 +434,9 @@ define(
 				 */

 				Symbol.prototype.show = function() {

 					this.visible = true;

+					this.showPrimitives();

 					this.refreshFromModelElement();

 					this.refreshCommentPrimitives();

-					this.showPrimitives();

 					this.showConnections();

 					this.showProximitySensor();

 				};

@@ -452,6 +452,12 @@ define(
 						var connectionToLane = conn.toAnchorPoint.symbol.parentSymbol;

 						// connections resides in current lane

 						if (connectionStartLane.id == connectionToLane.id) {

+							if (connectionStartLane.symbolXOffset > 0) {

+								conn.fromAnchorPoint.cacheX = conn.fromAnchorPoint.x;

+								conn.toAnchorPoint.cacheX = conn.toAnchorPoint.x;

+								this.connections[n].fromAnchorPoint.cacheOrientation = conn.fromAnchorPoint.orientation;

+								this.connections[n].toAnchorPoint.cacheOrientation = conn.toAnchorPoint.orientation;

+							}

 							this.connections[n].hide();

 						} else {

 							// from-anchor point adjustment