From b004ed7e491005462f3c07360e817dd5ca3cf384 Mon Sep 17 00:00:00 2001
From: girish <Girish.Joshi@bistasolutions.com>
Date: Mon, 17 Jan 2011 14:08:42 +0000
Subject: [PATCH] Fixed issue with IE8 (contextual menu from components don't
 show) and started work with saving multiple incoming routes of a
 parallel(Fork) gateway

---
 workflow/engine/templates/bpmn/MyWorkflow.js |  5 ---
 workflow/engine/templates/bpmn/bpmnShapes.js |  2 --
 workflow/engine/templates/bpmn/processmap.js | 33 ++++++++++----------
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/workflow/engine/templates/bpmn/MyWorkflow.js b/workflow/engine/templates/bpmn/MyWorkflow.js
index 3a32b38af..2f0b7d420 100755
--- a/workflow/engine/templates/bpmn/MyWorkflow.js
+++ b/workflow/engine/templates/bpmn/MyWorkflow.js
@@ -282,8 +282,6 @@ this.canvasGateway.on('contextmenu', function(e) {
 MyWorkflow.prototype.AddSubProcessContextMenu=function(_4092)
 {
     this.canvasSubProcess = Ext.get(_4092.id);
-    //var currentSelection = _4092.scope.currentSelection;
-    //var pmosExtObj = new pmosExt();
     this.contextSubProcessmenu = new Ext.menu.Menu({
         items: [
             {
@@ -705,9 +703,6 @@ MyWorkflow.prototype.editSubProcessProperties= function(_3525)
             title: 'Variables Out',
             collapsible: false,
             labelAlign: 'top',
-            //autoHeight:true,
-            //width: 600,
-            //defaultType: 'textfield',
              items:[variableOutGrid]
             },
             {
diff --git a/workflow/engine/templates/bpmn/bpmnShapes.js b/workflow/engine/templates/bpmn/bpmnShapes.js
index facbea6ce..c7af93066 100755
--- a/workflow/engine/templates/bpmn/bpmnShapes.js
+++ b/workflow/engine/templates/bpmn/bpmnShapes.js
@@ -18,8 +18,6 @@ bpmnTask.prototype.type = "bpmnTask"
 
 
 bpmnTask.prototype.coord_converter = function (bound_width, bound_height, text_length) {
-    //bound_width = this.workflow.currentSelection.width;
-    //bound_height = this.workflow.currentSelection.height;
     input_width = text_length * 6
     input_height = 10
 
diff --git a/workflow/engine/templates/bpmn/processmap.js b/workflow/engine/templates/bpmn/processmap.js
index 2c75a39b1..74c1c2052 100755
--- a/workflow/engine/templates/bpmn/processmap.js
+++ b/workflow/engine/templates/bpmn/processmap.js
@@ -8,8 +8,7 @@ Ext.onReady ( function() {
     //Getting process id from the URL using getUrlvars function
     var pro_uid = getUrlVars();
 
-    if(typeof pro_uid != 'undefined')
-    {
+    if(typeof pro_uid !== 'undefined') {
         Ext.Ajax.request({
             url: 'openProcess.php?PRO_UID=' + pro_uid,
             success: function(response) {
@@ -42,18 +41,19 @@ Ext.onReady ( function() {
         margins:'3 0 3 3',
         cmargins:'3 3 3 3',
         items:{
-            html:'<div id="x-shapes"><p id="x-shapes-task" title="Task" ><img src= "/skins/ext/images/gray/shapes/pallete/task.png"/></p>\n\
-                                             <p id="x-shapes-startEvent" title="Start"><img src= "/skins/ext/images/gray/shapes/pallete/startevent.png"/></p>\n\
-                                             <p id="x-shapes-interEvent" title="Intermediate Event"><img src= "/skins/ext/images/gray/shapes/pallete/interevent.png"/></p>\n\
-                                             <p id="x-shapes-endEvent" title="End Event"><img src= "/skins/ext/images/gray/shapes/pallete/endevent.png"/></p>\n\
-                                             <p id="x-shapes-gateways" title="Gateway"><img src= "/skins/ext/images/gray/shapes/pallete/gateway.png"/></p>\n\
-                                             <p id="x-shapes-group" title="Group"><img src= "/skins/ext/images/gray/shapes/pallete/group.png"/></p>\n\
-                                             <p id="x-shapes-annotation" title="Annotation"><img src= "/skins/ext/images/gray/shapes/pallete/annotation.png"/></p>\n\
-                                             <p id="x-shapes-dataobject" title="Data Object"><img src= "/skins/ext/images/gray/shapes/pallete/dataobject.png"/></p>\n\
-                                             <p id="x-shapes-pool" title="Pool"><img src= "/skins/ext/images/gray/shapes/pallete/pool.png"/></p>\n\
-                                             <p id="x-shapes-lane" title="Lane"><img src= "/skins/ext/images/gray/shapes/pallete/lane.png"/></p>\n\
-                                             <p id="x-shapes-milestone" title="Milestone"><img src= "/skins/ext/images/gray/shapes/pallete/milestone.png"/></p>\n\
-                                             </div>'
+            html:'<div id="x-shapes">\n\
+                        <p id="x-shapes-task" title="Task" ><img src= "/skins/ext/images/gray/shapes/pallete/task.png"/></p>\n\
+                        <p id="x-shapes-startEvent" title="Start"><img src= "/skins/ext/images/gray/shapes/pallete/startevent.png"/></p>\n\
+                        <p id="x-shapes-interEvent" title="Intermediate Event"><img src= "/skins/ext/images/gray/shapes/pallete/interevent.png"/></p>\n\
+                        <p id="x-shapes-endEvent" title="End Event"><img src= "/skins/ext/images/gray/shapes/pallete/endevent.png"/></p>\n\
+                        <p id="x-shapes-gateways" title="Gateway"><img src= "/skins/ext/images/gray/shapes/pallete/gateway.png"/></p>\n\
+                        <p id="x-shapes-group" title="Group"><img src= "/skins/ext/images/gray/shapes/pallete/group.png"/></p>\n\
+                        <p id="x-shapes-annotation" title="Annotation"><img src= "/skins/ext/images/gray/shapes/pallete/annotation.png"/></p>\n\
+                        <p id="x-shapes-dataobject" title="Data Object"><img src= "/skins/ext/images/gray/shapes/pallete/dataobject.png"/></p>\n\
+                        <p id="x-shapes-pool" title="Pool"><img src= "/skins/ext/images/gray/shapes/pallete/pool.png"/></p>\n\
+                        <p id="x-shapes-lane" title="Lane"><img src= "/skins/ext/images/gray/shapes/pallete/lane.png"/></p>\n\
+                        <p id="x-shapes-milestone" title="Milestone"><img src= "/skins/ext/images/gray/shapes/pallete/milestone.png"/></p>\n\
+                  </div>'
         }
     };
 
@@ -181,7 +181,7 @@ Ext.onReady ( function() {
             handler: function() {
                 workflow.zoom('out');
             }
-        },
+        }
     ],
         renderTo  : "center1",
         layout    : "border",
@@ -197,7 +197,7 @@ Ext.onReady ( function() {
             url: "processes_Ajax.php"+ urlparams,
             success: function(response) {
                 var processes = Ext.util.JSON.decode(response.responseText);
-                main.items.items[2].setTitle(processes.title.label);
+                main.items.items[2].setTitle(processes.title.label);     //items[2]=>center region
             },
             failure: function(){
                 Ext.Msg.alert ('Failure');
@@ -514,7 +514,6 @@ Ext.onReady ( function() {
             hash = hashes[i].split('=');
             vars.push(hash[0]);
             vars[hash[0]] = hash[1];
-
         }
         var pro_uid = vars["PRO_UID"];
         return pro_uid;