details: https://code.openbravo.com/erp/devel/pi/rev/4008ee3304aa changeset: 21916:4008ee3304aa user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Feb 04 23:40:49 2014 +0100 summary: Related to issue 22376: Prevent JS error with dojo windows and IE10
details: https://code.openbravo.com/erp/devel/pi/rev/0003b0a827ea changeset: 21917:0003b0a827ea user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Feb 04 23:43:21 2014 +0100 summary: Related to issue 22376: Prevent JS error in 'Payment Execution' popup and IE10 details: https://code.openbravo.com/erp/devel/pi/rev/da579e3e0ea1 changeset: 21918:da579e3e0ea1 user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Feb 04 23:46:37 2014 +0100 summary: Related to issue 22376: Improved classic tabs opening with IE10 now the fix should apply for IE >= 10 diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js | 6 +++--- web/js/dojo/dojo.js | 2 +- web/js/dojo/src/xml/Parse.js | 2 +- web/js/utils.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diffs (75 lines): diff -r 5915bbb61611 -r da579e3e0ea1 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js Tue Feb 04 16:27:50 2014 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js Tue Feb 04 23:46:37 2014 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2013 Openbravo SLU + * All portions are Copyright (C) 2010-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -63,7 +63,7 @@ }), tabSelected: function (tabNum, tabPane, ID, tab) { - if (navigator.userAgent.indexOf('Trident/6.0') !== -1) { + if (navigator.userAgent.indexOf('Trident') !== -1 && navigator.userAgent.indexOf('Trident/5.0') === -1) { // To fix a problem with Internet Explorer 10 and classic OB windows: http://forums.smartclient.com/showthread.php?t=27389 if (tabPane.viewId === 'OBClassicWindow' || tabPane.viewId === 'ClassicOBHelp') { tabPane.bringToFront(); @@ -81,7 +81,7 @@ }, tabDeselected: function (tabNum, tabPane, ID, tab, newTab) { - if (navigator.userAgent.indexOf('Trident/6.0') !== -1) { + if (navigator.userAgent.indexOf('Trident') !== -1 && navigator.userAgent.indexOf('Trident/5.0') === -1) { // To fix a problem with Internet Explorer 10 and classic OB windows: http://forums.smartclient.com/showthread.php?t=27389 if (tabPane.viewId === 'OBClassicWindow' || tabPane.viewId === 'ClassicOBHelp') { tabPane.sendToBack(); diff -r 5915bbb61611 -r da579e3e0ea1 web/js/dojo/dojo.js --- a/web/js/dojo/dojo.js Tue Feb 04 16:27:50 2014 +0100 +++ b/web/js/dojo/dojo.js Tue Feb 04 23:46:37 2014 +0100 @@ -1399,7 +1399,7 @@ if(_14a.substr(0,5)=="dojo:"){ return _14a; } -if(dojo.render.html.capable&&dojo.render.html.ie&&node.scopeName!="HTML"){ +if(dojo.render.html.capable&&dojo.render.html.ie&&node.scopeName&&node.scopeName!="HTML"){ return node.scopeName.toLowerCase()+":"+_14a; } if(_14a.substr(0,4)=="dojo"){ diff -r 5915bbb61611 -r da579e3e0ea1 web/js/dojo/src/xml/Parse.js --- a/web/js/dojo/src/xml/Parse.js Tue Feb 04 16:27:50 2014 +0100 +++ b/web/js/dojo/src/xml/Parse.js Tue Feb 04 23:46:37 2014 +0100 @@ -54,7 +54,7 @@ if(tagName.substr(0,5) == "dojo:"){ return tagName; } - if(dojo.render.html.capable && dojo.render.html.ie && node.scopeName != 'HTML'){ + if(dojo.render.html.capable && dojo.render.html.ie && node.scopeName && node.scopeName != 'HTML'){ return node.scopeName.toLowerCase() + ':' + tagName; } // <dojoTag> => dojo:tag diff -r 5915bbb61611 -r da579e3e0ea1 web/js/utils.js --- a/web/js/utils.js Tue Feb 04 16:27:50 2014 +0100 +++ b/web/js/utils.js Tue Feb 04 23:46:37 2014 +0100 @@ -1677,7 +1677,7 @@ return false; } if (isKeyboardLocked==false && !isCtrlPressed && !isAltPressed && pushedKey.type=='keydown' && pressedKeyCode!='16' && pressedKeyCode!='17' && pressedKeyCode!='18') { - if (typeof focusedWindowElement != "undefined") { + if (typeof focusedWindowElement != "undefined" && focusedWindowElement != null) { if (focusedWindowElement.tagName == 'SELECT') { if (focusedWindowElement.getAttribute('onchange') && navigator.userAgent.toUpperCase().indexOf("MSIE") == -1) setTimeout("focusedWindowElement.onchange();",50); } @@ -2389,7 +2389,7 @@ if (parent.frameMenu) { getFrame('main').isMenuBlock=true; } - if (aTag.className.indexOf("Main_LeftTabsBar_ButtonLeft_hidden") == -1) { + if (aTag && aTag.className && aTag.className.indexOf("Main_LeftTabsBar_ButtonLeft_hidden") == -1) { aTag.className = "Main_LeftTabsBar_ButtonLeft_hidden"; imgTag.className = "Main_LeftTabsBar_ButtonLeft_Icon"; disableAttributeWithFunction(aTag, 'obj', 'onclick'); ------------------------------------------------------------------------------ Managing the Performance of Cloud-Based Applications Take advantage of what the Cloud has to offer - Avoid Common Pitfalls. Read the Whitepaper. http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
