Merge branch 'master' of bitbucket.org:colosa/processmaker into CONSOLIDATED

2015-03-25 16:24:09 -04:00
parent 4f1112c990 1ad0369e0a
commit 36e6f97cc4
24 changed files with 1133 additions and 223 deletions
--- a/workflow/engine/js/processmap/core/processmap.js
+++ b/workflow/engine/js/processmap/core/processmap.js
@@ -2239,7 +2239,10 @@ var processmap=function(){
    /*
    * Aca se definen  TASK inicio y TASK a la que se deriva.
    */
-    event = event || window.event;
+    //In IE the event is undefined or 0
+    if(event === 0 || typeof(event) === 'undefined'){
+      event = window.event;
+    }

    if (event)
    {