Merged in jennydmz/processmaker (pull request #1346)
PM-1180 Menu contextual no se muestra bien en IE
This commit is contained in:
@@ -574,7 +574,7 @@ function saveProcess()
|
|||||||
if (projectType == 'classicProject') {
|
if (projectType == 'classicProject') {
|
||||||
location.href = 'processes_Map?PRO_UID='+resp.result.PRO_UID;
|
location.href = 'processes_Map?PRO_UID='+resp.result.PRO_UID;
|
||||||
} else {
|
} else {
|
||||||
if ( navigator.userAgent.indexOf('MSIE') !=-1 ) {
|
if ( (navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1) ){
|
||||||
if ( typeof(winDesigner) == "undefined" || winDesigner.closed ){
|
if ( typeof(winDesigner) == "undefined" || winDesigner.closed ){
|
||||||
winDesigner = window.open(
|
winDesigner = window.open(
|
||||||
"../designer?prj_uid="+resp.result.PRO_UID,
|
"../designer?prj_uid="+resp.result.PRO_UID,
|
||||||
@@ -635,7 +635,7 @@ editProcess = function(typeParam)
|
|||||||
url = 'processes_Map?PRO_UID=' + pro_uid;
|
url = 'processes_Map?PRO_UID=' + pro_uid;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( (navigator.userAgent.indexOf('MSIE') !=-1) && (type == "bpmn") ) {
|
if ( ((navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1)) && (type == "bpmn") ) {
|
||||||
if (typeof(winDesigner) == "undefined" || winDesigner.closed){
|
if (typeof(winDesigner) == "undefined" || winDesigner.closed){
|
||||||
winDesigner = window.open(
|
winDesigner = window.open(
|
||||||
url,
|
url,
|
||||||
@@ -951,7 +951,7 @@ importProcessExistGroup = function()
|
|||||||
var sNewProUid = resp_.sNewProUid;
|
var sNewProUid = resp_.sNewProUid;
|
||||||
|
|
||||||
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
|
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
|
||||||
if ( navigator.userAgent.indexOf('MSIE') !=-1 ) {
|
if ((navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1) ) {
|
||||||
if (typeof(winDesigner) == "undefined" || winDesigner.closed){
|
if (typeof(winDesigner) == "undefined" || winDesigner.closed){
|
||||||
winDesigner = window.open(
|
winDesigner = window.open(
|
||||||
"../designer?prj_uid=" + sNewProUid,
|
"../designer?prj_uid=" + sNewProUid,
|
||||||
@@ -1097,7 +1097,7 @@ importProcessExistProcess = function()
|
|||||||
|
|
||||||
if (resp_.ExistGroupsInDatabase == 0) {
|
if (resp_.ExistGroupsInDatabase == 0) {
|
||||||
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
|
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
|
||||||
if ( navigator.userAgent.indexOf('MSIE') !=-1 ) {
|
if ( (navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1)) {
|
||||||
if (typeof(winDesigner) == "undefined" || winDesigner.closed){
|
if (typeof(winDesigner) == "undefined" || winDesigner.closed){
|
||||||
winDesigner = window.open(
|
winDesigner = window.open(
|
||||||
"../designer?prj_uid=" + sNewProUid,
|
"../designer?prj_uid=" + sNewProUid,
|
||||||
@@ -1235,7 +1235,7 @@ importProcess = function()
|
|||||||
var sNewProUid = resp_.sNewProUid;
|
var sNewProUid = resp_.sNewProUid;
|
||||||
|
|
||||||
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
|
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
|
||||||
if ( navigator.userAgent.indexOf('MSIE') !=-1 ) {
|
if ((navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1)) {
|
||||||
if (typeof(winDesigner) == "undefined" || winDesigner.closed){
|
if (typeof(winDesigner) == "undefined" || winDesigner.closed){
|
||||||
winDesigner = window.open(
|
winDesigner = window.open(
|
||||||
"../designer?prj_uid=" + sNewProUid,
|
"../designer?prj_uid=" + sNewProUid,
|
||||||
|
|||||||
Reference in New Issue
Block a user