details:   https://code.openbravo.com/erp/devel/pi/rev/791f143310a1
changeset: 16500:791f143310a1
user:      David Baz Fayos <david.baz <at> openbravo.com>
date:      Sat May 12 16:52:38 2012 +0200
summary:   Fixed issue 20480: Unneeded scrollbar is not shown anymore in IE9 
classic popups

diffstat:

 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js
 |  12 +++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r 9ae759d03174 -r 791f143310a1 
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
      Sat May 12 16:00:55 2012 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js
      Sat May 12 16:52:38 2012 +0200
@@ -363,6 +363,16 @@
         if (isModal !== false) {
           isModal = true;
         }
+        var _htmlCode, _isIE9Strict = false,
+            _navUserAgent = navigator.userAgent.toUpperCase();
+        if (_navUserAgent.indexOf("MSIE") !== -1 && (document.documentMode && 
document.documentMode >= 9)) {
+          _isIE9Strict = true;
+        }
+        if (_isIE9Strict || _navUserAgent.indexOf("MSIE") === -1) { // IE >= 9 
(Strict) or any other browser
+          _htmlCode = '<html><head></head><body style="margin: 0; padding: 0; 
border: none;">' + '<iframe id="MDIPopupContainer" name="MDIPopupContainer" 
style="margin: 0; padding: 0; border: none; width: 100%; height: 
100%;"></iframe>' + '<iframe name="frameMenu" scrolling="no" src="' + 
OB.Application.contextUrl + 'utility/VerticalMenu.html?Command=HIDE" 
id="paramFrameMenuLoading" style="margin: 0px; padding: 0px; border: 0px; 
height: 0px; width: 0px;"></iframe>' + '</body></html>';
+        } else { // IE <= 8
+          _htmlCode = '<html><head></head><frameset cols="*, 0%" rows="*" 
frameborder="no" border="0" framespacing="0">' + '<frame id="MDIPopupContainer" 
name="MDIPopupContainer"></frame>' + '<frame name="frameMenu" scrolling="no" 
src="' + OB.Application.contextUrl + 'utility/VerticalMenu.html?Command=HIDE" 
id="paramFrameMenuLoading"></frame>' + '</frameset><body></body></html>';
+        }
         var cPopup = isc.OBClassicPopup.create({
           ID: name + '_' + cobcomp.Popup.secString,
           width: width,
@@ -376,7 +386,7 @@
           areParamsSet: false,
           isFramesetDraw: false,
           isLoaded: false,
-          htmlCode: '<html><head></head><frameset cols="*, 0%" rows="*" 
frameborder="no" border="0" framespacing="0">' + '<frame id="MDIPopupContainer" 
name="MDIPopupContainer"></frame>' + '<frame name="frameMenu" scrolling="no" 
src="' + OB.Application.contextUrl + 'utility/VerticalMenu.html?Command=HIDE" 
id="paramFrameMenuLoading"></frame>' + '</frameset><body></body></html>',
+          htmlCode: _htmlCode,
           popupURL: url + urlCharacter + 'IsPopUpCall=1'
         });
         cPopup.show();

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to