From 93ea13a75ae40950a35ac86f1aa5f8e4033c541b Mon Sep 17 00:00:00 2001
From: girish <Girish.Joshi@bistasolutions.com>
Date: Thu, 24 Feb 2011 10:57:36 +0000
Subject: [PATCH] Fixed zoom function

---
 .../engine/templates/bpmn/EventEmptyStart.js  |  4 +--
 workflow/engine/templates/bpmn/MyWorkflow.js  | 27 +++++++++----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/workflow/engine/templates/bpmn/EventEmptyStart.js b/workflow/engine/templates/bpmn/EventEmptyStart.js
index 149f9adfb..7cacc69e2 100755
--- a/workflow/engine/templates/bpmn/EventEmptyStart.js
+++ b/workflow/engine/templates/bpmn/EventEmptyStart.js
@@ -9,15 +9,13 @@ this.stroke=2;
 if(typeof workflow.zoomfactor == 'undefined')
   workflow.zoomfactor = 1;
   //Set the Task Limitation
-  if(typeof this.limitFlag == 'undefined' || this.limitFlag == false)
-  {
+  if(typeof this.limitFlag == 'undefined' || this.limitFlag == false) {
     this.originalWidth = 30;
     this.originalHeight = 30;
     this.orgXPos = this.getX();
     this.orgYPos = this.getY();
     this.orgFontSize =this.fontSize;
   }
-
   this.width  = this.originalWidth * workflow.zoomfactor;
   this.height = this.originalHeight  * workflow.zoomfactor;
 
diff --git a/workflow/engine/templates/bpmn/MyWorkflow.js b/workflow/engine/templates/bpmn/MyWorkflow.js
index 0daa28c4e..f103eb466 100755
--- a/workflow/engine/templates/bpmn/MyWorkflow.js
+++ b/workflow/engine/templates/bpmn/MyWorkflow.js
@@ -1854,11 +1854,7 @@ MyWorkflow.prototype.zoom = function(sType)
    for(f = 0;f<figures.getSize();f++){
    var fig = figures.get(f);
    loadMask.show();
-   if(typeof fig.limitFlag == 'undefined')
-       fig.limitFlag = true;
-   if(fig.limitFlag == false){
-     fig.originalWidth = fig.getWidth();
-     fig.originalHeight = fig.getHeight();
+   if(typeof fig.limitFlag == 'undefined'){
      fig.orgXPos = fig.getX();
      fig.orgYPos = fig.getY();
      fig.orgFontSize =fig.fontSize;
@@ -1869,6 +1865,14 @@ MyWorkflow.prototype.zoom = function(sType)
      }
      fig.limitFlag = true;
    }
+
+   if(fig.limitFlag == false){
+     fig.originalWidth = fig.getWidth();
+     fig.originalHeight = fig.getHeight();
+     fig.limitFlag = true;
+   }
+   
+   
    //If zooming is 100% disable resizing of shapes again
    if(sType == '1'){
      fig.limitFlag = true;
@@ -1880,15 +1884,10 @@ MyWorkflow.prototype.zoom = function(sType)
      fig.y4 = fig.orgy4Pos *sType;
      fig.y5 = fig.orgy5Pos *sType;
    }
-
-   if(sType == '1.5' || sType == '2') {
-     var xPos =  fig.orgXPos * sType * 0.5;
-     var yPos =  fig.orgYPos * sType * 0.5;
-   }
-   else {
-     var xPos =  fig.orgXPos * sType;
-     var yPos =  fig.orgYPos * sType;
-   }
+   
+   var xPos =  fig.orgXPos * sType;
+   var yPos =  fig.orgYPos * sType;
+   
    if(fig.type == 'bpmnTask') {
       fig.fontSize = parseInt(fig.orgFontSize) * sType;
       //fig.bpmnText.drawStringRect(fig.taskName, fig.padleft, fig.padtop, fig.rectWidth, fig.rectheight, 'center');