details: https://code.openbravo.com/erp/devel/pi/rev/9bd74e8a00d3
changeset: 28036:9bd74e8a00d3
user: Carlos Aristu <carlos.aristu <at> openbravo.com>
date: Tue Nov 24 12:41:26 2015 +0100
summary: related to issue 31528: code review improvements, use isIE9Strict
for IE11 also
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js
| 4 ++--
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
| 7 +------
src/org/openbravo/erpCommon/security/Login.html
| 2 +-
src/org/openbravo/erpCommon/security/Login_F1.html
| 2 +-
src/org/openbravo/erpCommon/utility/PopupLoading.html
| 2 +-
web/js/utils.js
| 8 ++------
6 files changed, 8 insertions(+), 17 deletions(-)
diffs (104 lines):
diff -r 31ed65965815 -r 9bd74e8a00d3
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js
Tue Nov 24 10:37:51 2015 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js
Tue Nov 24 12:41:26 2015 +0100
@@ -446,8 +446,8 @@
if (!cPopup.areParamsSet) {
if (!postParams) {
cPopup.getIframeHtmlObj().contentWindow.frames[0].location.href =
cPopup.popupURL;
- if (OB.Utilities.isIE9Strict || OB.Utilities.isIE11 ||
OB.Utilities.isEdge) {
- // In IE9 Strict, IE11 and Edge, when the location.href or .src
is defined, the previous defined opener is lost, and it should be defined again
+ if (OB.Utilities.isIE9Strict || OB.Utilities.isEdge) {
+ // In IE9 Strict and Edge, when the location.href or .src is
defined, the previous defined opener is lost, and it should be defined again
cPopup.getIframeHtmlObj().contentWindow.frames[0].opener =
cPopup.theOpener;
var setOpenerInterval;
setOpenerInterval = setInterval(
diff -r 31ed65965815 -r 9bd74e8a00d3
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
Tue Nov 24 10:37:51 2015 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
Tue Nov 24 12:41:26 2015 +0100
@@ -23,15 +23,10 @@
OB.Utilities = {};
OB.Utilities.isIE9Strict = false;
-if (navigator.userAgent.toUpperCase().indexOf("MSIE") !== -1 &&
(document.documentMode && document.documentMode >= 9)) {
+if ((navigator.userAgent.toUpperCase().indexOf("MSIE") !== -1 ||
navigator.userAgent.toUpperCase().indexOf("TRIDENT") !== -1) &&
(document.documentMode && document.documentMode >= 9)) {
OB.Utilities.isIE9Strict = true;
}
-OB.Utilities.isIE11 = false;
-if (navigator.userAgent.toUpperCase().indexOf("TRIDENT") !== -1 &&
navigator.userAgent.toUpperCase().indexOf("RV:11") !== -1) {
- OB.Utilities.isIE11 = true;
-}
-
OB.Utilities.isEdge = false;
if (navigator.userAgent.toUpperCase().indexOf("EDGE") !== -1) {
OB.Utilities.isEdge = true;
diff -r 31ed65965815 -r 9bd74e8a00d3
src/org/openbravo/erpCommon/security/Login.html
--- a/src/org/openbravo/erpCommon/security/Login.html Tue Nov 24 10:37:51
2015 +0100
+++ b/src/org/openbravo/erpCommon/security/Login.html Tue Nov 24 12:41:26
2015 +0100
@@ -406,7 +406,7 @@
}
catch (e) { }
- if ((!revisionControl('27919')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('28036')) || (isOpsInstance() !=
isOpsInstanceCached())) {
maskLoginWindow(cacheMsg);
setLoginMessage('Warning', '', cacheMsg);
}
diff -r 31ed65965815 -r 9bd74e8a00d3
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Tue Nov 24
10:37:51 2015 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Tue Nov 24
12:41:26 2015 +0100
@@ -126,7 +126,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('27919')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('28036')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert(cacheMsg);
}
diff -r 31ed65965815 -r 9bd74e8a00d3
src/org/openbravo/erpCommon/utility/PopupLoading.html
--- a/src/org/openbravo/erpCommon/utility/PopupLoading.html Tue Nov 24
10:37:51 2015 +0100
+++ b/src/org/openbravo/erpCommon/utility/PopupLoading.html Tue Nov 24
12:41:26 2015 +0100
@@ -38,7 +38,7 @@
<script language="javascript">
function onLoadDo() {
moreOnLoadDoFunctions();
- if (isIE9Strict || isIE11 || isEdge) {
+ if (isIE9Strict || isEdge) {
var i=0;
var setOpenerInterval = setInterval(
function() {
diff -r 31ed65965815 -r 9bd74e8a00d3 web/js/utils.js
--- a/web/js/utils.js Tue Nov 24 10:37:51 2015 +0100
+++ b/web/js/utils.js Tue Nov 24 12:41:26 2015 +0100
@@ -26,12 +26,9 @@
* Code that will be executed once the file is parsed
*/
function utilsJSDirectExecution() {
- if (navigator.userAgent.toUpperCase().indexOf("MSIE") !== -1 &&
getBrowserInfo('documentMode') >= 9 && parseInt(getBrowserInfo('majorVersion'),
10) >= 9) {
+ if ((navigator.userAgent.toUpperCase().indexOf("MSIE") !== -1 ||
navigator.userAgent.toUpperCase().indexOf("TRIDENT") !== -1) &&
getBrowserInfo('documentMode') >= 9 && parseInt(getBrowserInfo('majorVersion'),
10) >= 9) {
isIE9Strict = true;
}
- if (navigator.userAgent.toUpperCase().indexOf("TRIDENT") !== -1 &&
parseInt(getBrowserInfo('majorVersion'), 10) == 11) {
- isIE11 = true;
- }
if (navigator.userAgent.toUpperCase().indexOf("EDGE") !== -1) {
isEdge = true;
}
@@ -46,7 +43,6 @@
}
var isIE9Strict = false;
-var isIE11 = false;
var isEdge = false;
var isRTL = false;
var isWindowInMDIPopup = false;
@@ -109,7 +105,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 = '27919';
+ var number = '28036';
return number;
}
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741551&iu=/4140
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
