Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6372)

Unified Diff: chrome_frame/CFInstall.js

Issue 397028: Fixes detection logic for IE under XP SP2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/CFInstall.js
===================================================================
--- chrome_frame/CFInstall.js (revision 32183)
+++ chrome_frame/CFInstall.js (working copy)
@@ -109,6 +109,7 @@
'top: 50%;' +
'border: 1px solid #93B4D9;' +
'background-color: white;' +
+ 'z-index: 2001;' +
'}' +
'.chromeFrameOverlayContent iframe {' +
'width: 800px;' +
@@ -131,6 +132,7 @@
'-ms-filter: ' +
'"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";' +
'filter: alpha(opacity=50);' +
+ 'z-index: 2000;' +
'}';
injectStyleSheet(rules);
cfStyleTagInjected = true;
@@ -239,7 +241,11 @@
'</tr>' +
'</table>';
- document.body.appendChild(n);
+ var b = document.body;
+ // Insert underlay nodes into the document in the right order.
+ while (n.firstChild) {
+ b.insertBefore(n.lastChild, b.firstChild);
+ }
var ifr = makeIframe(args);
byId('chromeFrameIframeHolder').appendChild(ifr);
byId('chromeFrameCloseButton').onclick = closeOverlay;
@@ -271,10 +277,12 @@
// We also only support Win2003/XPSP2 or better. See:
// http://msdn.microsoft.com/en-us/library/ms537503%28VS.85%29.aspx
if (parseFloat(ua.split(ieRe)[1]) < 6 &&
- ua.indexOf('SV1') >= 0) {
+ // 'SV1' indicates SP2, only bail if not SP2 or Win2K3
+ ua.indexOf('SV1') < 0) {
bail = true;
}
} else {
+ // Not IE
bail = true;
}
if (bail) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698