summaryrefslogtreecommitdiffstats
path: root/chrome_frame/CFInstall.js
diff options
context:
space:
mode:
authorslightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 23:59:36 +0000
committerslightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 23:59:36 +0000
commit6a12f0febe4d54155f55fad0c8c15978fcb3e909 (patch)
tree87cb0f6383cf2400388ac1b17fa5471999811459 /chrome_frame/CFInstall.js
parentbb56b443c1ee2ca9d4a636768ff16216d8565878 (diff)
downloadchromium_src-6a12f0febe4d54155f55fad0c8c15978fcb3e909.zip
chromium_src-6a12f0febe4d54155f55fad0c8c15978fcb3e909.tar.gz
chromium_src-6a12f0febe4d54155f55fad0c8c15978fcb3e909.tar.bz2
Fixes incorrect test against OS version instead of browser version
BUG=28038,29193 TEST=on any XP box this should pass: chrome_frame_test.exe --gtest_filter=*CFInstall* Review URL: http://codereview.chromium.org/469012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/CFInstall.js')
-rw-r--r--chrome_frame/CFInstall.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/CFInstall.js b/chrome_frame/CFInstall.js
index bddfe3bb..e8190cb6 100644
--- a/chrome_frame/CFInstall.js
+++ b/chrome_frame/CFInstall.js
@@ -271,12 +271,12 @@
// We currently only support CF in IE
// TODO(slightlyoff): Update this should we support other browsers!
var ua = navigator.userAgent;
- var ieRe = /MSIE \S+; Windows NT/;
+ var ieRe = /MSIE (\S+); Windows NT/;
var bail = false;
if (ieRe.test(ua)) {
// 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 &&
+ if (parseFloat(ieRe.exec(ua)[1]) < 6 &&
// 'SV1' indicates SP2, only bail if not SP2 or Win2K3
ua.indexOf('SV1') < 0) {
bail = true;