details: https://code.openbravo.com/erp/devel/pi/rev/764603e2f149 changeset: 21896:764603e2f149 user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Jan 30 22:54:06 2014 +0100 summary: Fixed issue 25255: Added IE9 compatibiliy mode to ensure Openbravo works ok in IE10 and IE11
details: https://code.openbravo.com/erp/devel/pi/rev/b4873ea66b7b changeset: 21897:b4873ea66b7b user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Jan 30 22:58:13 2014 +0100 summary: Related to issue 25255: Updated copyrights and the revision control number diffstat: src/index.jsp | 3 ++- src/org/openbravo/erpCommon/security/Login.html | 2 +- src/org/openbravo/erpCommon/security/Login_F1.html | 2 +- web/js/utils.js | 9 ++++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diffs (84 lines): diff -r 018b8e666e7d -r b4873ea66b7b src/index.jsp --- a/src/index.jsp Thu Jan 30 16:20:10 2014 +0530 +++ b/src/index.jsp Thu Jan 30 22:58:13 2014 +0100 @@ -28,7 +28,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) 2011-2012 Openbravo SLU + * All portions are Copyright (C) 2011-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -84,6 +84,7 @@ <html dir="<%=(OBContext.isRightToLeft() ? "RTL" : "LTR")%>"> <head> +<meta http-equiv="X-UA-Compatible" content="IE=9"> <meta http-equiv="Expires" content="Tue, 24 Apr 1979 00:00:01 GMT"/> <meta http-equiv="Content-type" content="text/html;charset=utf-8"/> <meta http-equiv="Cache-Control" content="no-cache no-store must-revalidate" > diff -r 018b8e666e7d -r b4873ea66b7b src/org/openbravo/erpCommon/security/Login.html --- a/src/org/openbravo/erpCommon/security/Login.html Thu Jan 30 16:20:10 2014 +0530 +++ b/src/org/openbravo/erpCommon/security/Login.html Thu Jan 30 22:58:13 2014 +0100 @@ -406,7 +406,7 @@ } catch (e) { } - if ((!revisionControl('21641')) || (isOpsInstance() != isOpsInstanceCached())) { + if ((!revisionControl('21897')) || (isOpsInstance() != isOpsInstanceCached())) { maskLoginWindow(cacheMsg); setLoginMessage('Warning', '', cacheMsg); } diff -r 018b8e666e7d -r b4873ea66b7b src/org/openbravo/erpCommon/security/Login_F1.html --- a/src/org/openbravo/erpCommon/security/Login_F1.html Thu Jan 30 16:20:10 2014 +0530 +++ b/src/org/openbravo/erpCommon/security/Login_F1.html Thu Jan 30 22:58:13 2014 +0100 @@ -126,7 +126,7 @@ clearForm(); } catch (e) {} setWindowElementFocus('firstElement'); - if ((!revisionControl('21641')) || (isOpsInstance() != isOpsInstanceCached())) { + if ((!revisionControl('21897')) || (isOpsInstance() != isOpsInstanceCached())) { alert(cacheMsg); } diff -r 018b8e666e7d -r b4873ea66b7b web/js/utils.js --- a/web/js/utils.js Thu Jan 30 16:20:10 2014 +0530 +++ b/web/js/utils.js Thu Jan 30 22:58:13 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) 2001-2013 Openbravo SLU + * All portions are Copyright (C) 2001-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -101,7 +101,7 @@ * Return a number that would be checked at the Login screen to know if the file is cached with the correct version */ function getCurrentRevision() { - var number = '21641'; + var number = '21897'; return number; } @@ -131,6 +131,9 @@ if (navUserAgent.indexOf("MSIE") >= 0) { browserName = "Microsoft Internet Explorer"; i=navUserAgent.indexOf("MSIE")+5; + } else if (navUserAgent.indexOf("TRIDENT") >= 0 && navUserAgent.indexOf("RV:") >= 0) { + browserName = "Microsoft Internet Explorer"; + i=navUserAgent.indexOf("RV:")+3; } else if (navUserAgent.indexOf("FIREFOX") >= 0) { browserName = "Mozilla Firefox"; i=navUserAgent.indexOf("FIREFOX")+8; @@ -162,7 +165,7 @@ i=navUserAgent.indexOf("KONQUEROR")+10; } if (i!=0) { - while (navUserAgent.substring(i, i+1) != " " && navUserAgent.substring(i, i+1) != ";" && i < navUserAgent.length) { + while (navUserAgent.substring(i, i+1) != " " && navUserAgent.substring(i, i+1) != ";" && navUserAgent.substring(i, i+1) != ")" && i < navUserAgent.length) { browserVersion += navUserAgent.substring(i, i+1); i++; } ------------------------------------------------------------------------------ WatchGuard Dimension instantly turns raw network data into actionable security intelligence. It gives you real-time visual feedback on key security issues and trends. Skip the complicated setup - simply import a virtual appliance and go from zero to informed in seconds. http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
