summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-10-15 07:52:47 (EDT)
committer Manik Kishore2012-10-15 07:52:47 (EDT)
commit0bfce81e68c8a18f93698a513ead6936aaf72b0f (patch)
tree3d7886103b42e32d4a7527eb35f130eed457403b
parent8619a3130fa84badccefe0135a3703814a822215 (diff)
downloadorg.eclipse.stardust.ui.web-0bfce81e68c8a18f93698a513ead6936aaf72b0f.zip
org.eclipse.stardust.ui.web-0bfce81e68c8a18f93698a513ead6936aaf72b0f.tar.gz
org.eclipse.stardust.ui.web-0bfce81e68c8a18f93698a513ead6936aaf72b0f.tar.bz2
CRNT-26452
Made changes to reset the x,y lane is moved to left or top. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@60037 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_swimlaneSymbol.js21
1 files changed, 17 insertions, 4 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_swimlaneSymbol.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_swimlaneSymbol.js
index 4a1d8bb..bb88202 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_swimlaneSymbol.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_swimlaneSymbol.js
@@ -979,23 +979,36 @@ define(
+ m_constants.POOL_SWIMLANE_TOP_BOX_HEIGHT
- parseInt(preAdjustmentPos.height);
+ }else if (this.y < preAdjustmentPos.y
+ && this.height > preAdjustmentPos.height) {
+ this.y = preAdjustmentPos.y;
+ moveY = this.width - parseInt(preAdjustmentPos.height);
}
+
// If Symbol is moved beyond the starting X margin and
- // Height has increased, calculate the height change to move
+ // Height has increased, calculate the width change to move
// Symbol
- if (parseInt(preAdjustmentPos.x)> (parseInt(x))
+ if (parseInt(preAdjustmentPos.x) > (parseInt(x))
&& parseInt(this.width) > parseInt(preAdjustmentPos.width
.valueOf())) {
moveX = this.width + m_constants.POOL_SWIMLANE_MARGIN
- parseInt(preAdjustmentPos.width);
- }
+ }else if (this.x < preAdjustmentPos.x
+ && this.width > preAdjustmentPos.width) {
+ this.x = preAdjustmentPos.x;
+ moveX = this.width - parseInt(preAdjustmentPos.width);
+ }
+
if (moveX > 0 || moveY > 0) {
for ( var n in this.containedSymbols) {
this.containedSymbols[n].moveBy(moveX, moveY);
}
}
- if(preAdjustmentPos.width != this.width || preAdjustmentPos.height != this.height){
+
+ if (preAdjustmentPos.width != this.width
+ || preAdjustmentPos.height != this.height) {
+
var changes = {
x : this.x,
y : this.y,