summaryrefslogtreecommitdiffstats
path: root/chrome_frame/CFInstall.js
diff options
context:
space:
mode:
authorslightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 01:48:30 +0000
committerslightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 01:48:30 +0000
commit9caff42ae951d909e394565849a3c0b2ebc9ce3d (patch)
treeefdf192a2635e55b5d6c51798f41ab9b99c66e28 /chrome_frame/CFInstall.js
parent4a1bd4cab15c877feb9fc360d83565a846e40d06 (diff)
downloadchromium_src-9caff42ae951d909e394565849a3c0b2ebc9ce3d.zip
chromium_src-9caff42ae951d909e394565849a3c0b2ebc9ce3d.tar.gz
chromium_src-9caff42ae951d909e394565849a3c0b2ebc9ce3d.tar.bz2
Fixes detection logic for IE under XP SP2.
BUG=28038 Test=none Review URL: http://codereview.chromium.org/397028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/CFInstall.js')
-rw-r--r--chrome_frame/CFInstall.js12
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome_frame/CFInstall.js b/chrome_frame/CFInstall.js
index b7315bd..bddfe3bb 100644
--- a/chrome_frame/CFInstall.js
+++ b/chrome_frame/CFInstall.js
@@ -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) {