From e6ef5ccf199bd0d10c52206f5828a599f1469375 Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Thu, 3 Sep 2015 17:15:50 -0400 Subject: [PATCH] PM-3169: 0017857: No se puede abrir las opciones de las tareas en PM 3.0 using IE11 --- gulliver/js/maborak/core/module.app.js | 6 ++-- gulliver/js/maborak/core/module.panel.js | 41 +++++++++++++----------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/gulliver/js/maborak/core/module.app.js b/gulliver/js/maborak/core/module.app.js index 8ae991e1c..3a3baae28 100755 --- a/gulliver/js/maborak/core/module.app.js +++ b/gulliver/js/maborak/core/module.app.js @@ -363,7 +363,7 @@ leimnud.Package.Public({ //evt = window.event || evt; //var dv=(this.parent.browser.isIE?evt:el); //alert(evt.a) - dv=(this.parent.browser.isIE?evt:el); + dv=(this.parent.browser.isIE?((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?el:evt):el); var i=dv.i; dv.a.className="app_menuRight_option_over___"+this.options.theme; dv.b.className="app_menuRight_option_image_over___"+this.options.theme; @@ -407,7 +407,7 @@ leimnud.Package.Public({ }.extend(this,{a:dv,b:spI,i:i}); dv.onmouseout=function(evt,el){ - var dv=(this.parent.browser.isIE?evt:el); + var dv=(this.parent.browser.isIE?((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?el:evt):el); if(this.submenu) { return false; @@ -447,7 +447,7 @@ leimnud.Package.Public({ //alert(this.submenu.options.parent_menu); } this.remove(); - opt=this.parent.browser.isIE?evt:opt; + opt=this.parent.browser.isIE?((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?opt:evt):opt; var lch = this.options.menu[opt]; if(lch && typeof lch.launch=="function") { diff --git a/gulliver/js/maborak/core/module.panel.js b/gulliver/js/maborak/core/module.panel.js index c7bce65f6..9dc5275f9 100755 --- a/gulliver/js/maborak/core/module.panel.js +++ b/gulliver/js/maborak/core/module.panel.js @@ -703,11 +703,11 @@ leimnud.Package.Public({ //tb.onmouseover = this.styles.tabCSS.sover.args(tb); //tb.onmouseout = this.styles.tabCSS.sout.args(tb); tb.onmouseover = function(o,j){ - o = window.event?o:j; + o = window.event?((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?j:o):j; o.a.className=o.b; }.args({a:tb,b:"panel_tabOptionSelectedOver"+thm+"___"+this.getTheme("tabOptionSelectedOver")}); tb.onmouseout = function(o,j){ - o = window.event?o:j; + o = window.event?((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?j:o):j; o.a.className=o.b; }.args({a:tb,b:"panel_tabOptionSelected"+thm+"___"+this.getTheme("tabOptionSelected")}); var tc = (typeof this.tab.options[this.tabSelected].content); @@ -719,7 +719,7 @@ leimnud.Package.Public({ }));*/ if(this.tab.display==="vertical") { - var hj = (parseInt(this.parent.dom.getStyle(tb,"width"),10)-((!this.parent.browser.isIE)?3:0)); + var hj = (parseInt(this.parent.dom.getStyle(tb,"width"),10)-((!this.parent.browser.isIE)?((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?0:3):0)); this.parent.dom.setStyle(tb,{ width :hj, borderLeftWidth :4 @@ -741,17 +741,17 @@ leimnud.Package.Public({ tls.className="panel_tabOption"+thm+"___"+this.getTheme("tabOption"); //tls.onmouseover = this.styles.tabCSS.over.args(tls); tls.onmouseover = function(o,j){ - o = window.event?o:j; + o = window.event?((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?j:o):j; o.a.className=o.b; }.args({a:tls,b:"panel_tabOptionOver"+thm+"___"+this.getTheme("tabOptionOver")}); //tls.onmouseout = this.styles.tabCSS.out.args(tls); tls.onmouseout = function(o,j){ - o = window.event?o:j; + o = window.event?((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?j:o):j; o.a.className=o.b; }.args({a:tls,b:"panel_tabOption"+thm+"___"+this.getTheme("tabOption")}); tls.onmouseup=function(event,tabID){ if(this.tab.manualDisabled){return false;} - this.tabSelected=(this.parent.browser.isIE)?event:tabID; + this.tabSelected=(this.parent.browser.isIE)?((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?tabID:event):tabID; this.makeTab(); //this.resize(); return false; @@ -765,7 +765,7 @@ leimnud.Package.Public({ if(this.tab.display==="vertical") { this.parent.dom.setStyle(tls,{ - width :parseInt(this.parent.dom.getStyle(tb,"width"),10)+((!this.parent.browser.isIE)?3:0), + width :parseInt(this.parent.dom.getStyle(tb,"width"),10)+((!this.parent.browser.isIE)?((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?0:3):0), borderLeftWidth :1 }); } @@ -1232,7 +1232,7 @@ leimnud.Package.Public({ frontend:function() { this.parent.dom.setStyle(this.elements.frontend,{ - width:(this.parent.browser.isIE)?"auto":"100%" + width:(this.parent.browser.isIE)?((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?"100%":"auto"):"100%" //height:"100%", //position:"absolute", //backgroundColor:"#FFFFFF", @@ -1435,6 +1435,11 @@ leimnud.Package.Public({ position:"absolute", zIndex :this.zIndex-3 }); + if(!!navigator.userAgent.match(/Trident.*rv[ :]*11\./)) { + this.parent.dom.setStyle(this.elements.modal,{ + opacity :this.styles.fx.opacityShadow.Static/100 + }); + } /*} else { @@ -1482,7 +1487,7 @@ leimnud.Package.Public({ if(this.tab.options) { this.parent.dom.setStyle(this.elements.tab,{ - height :((this.tab.display==="vertical")?heightContent:this.tab.optHeight+4+(this.parent.browser.isIE ? 14 : 0)), + height :((this.tab.display==="vertical")?heightContent:this.tab.optHeight+4+(this.parent.browser.isIE ? ((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?0:14) : 0)), //border :"1px solid red", width :((this.tab.display==="vertical")?this.tab.width:this.options.size.w-8), top :beginTop, @@ -1495,7 +1500,7 @@ leimnud.Package.Public({ this.tab.step = (typeof this.tab.step=="number")?this.tab.step:5; this.tab.optHeight = this.tab.optHeight || 25; this.tab.optWidth = (this.tab.optWidth || (this.tab.width -4));*/ - this.tab.diffWidthBugPadding = ((this.parent.browser.isIE)?0:20); + this.tab.diffWidthBugPadding = ((this.parent.browser.isIE)?((!!navigator.userAgent.match(/Trident.*rv[ :]*11\./))?20:0):20); this.elements.tabOptions=[]; var lastBul = 0; for(var i=0;i