Skip to content

Commit dd93d0e

Browse files
committed
Begrudgingly adds chrome detection to jQuery.browser (1.7). Fixes #9385
1 parent 96501d3 commit dd93d0e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/core.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ var jQuery = function( selector, context ) {
3939
rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
4040

4141
// Useragent RegExp
42+
rchrome = /(chrome)[ \/]([\w.]+)/,
4243
rwebkit = /(webkit)[ \/]([\w.]+)/,
4344
ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
4445
rmsie = /(msie) ([\w.]+)/,
@@ -829,7 +830,8 @@ jQuery.extend({
829830
uaMatch: function( ua ) {
830831
ua = ua.toLowerCase();
831832

832-
var match = rwebkit.exec( ua ) ||
833+
var match = rchrome.exec( ua ) ||
834+
rwebkit.exec( ua ) ||
833835
ropera.exec( ua ) ||
834836
rmsie.exec( ua ) ||
835837
ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||

test/data/ua.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ mozilla 1.0.1 Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.0.1) G
3737
mozilla 1.8.0.10 Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.8.0.10) Gecko/20070228 Camino/1.0.4
3838
webkit 418.9 Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/418.9 (KHTML, like Gecko, Safari) Safari/419.3 Cheshire/1.0.ALPHA
3939
webkit 419 Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/419 (KHTML, like Gecko, Safari/419.3) Cheshire/1.0.ALPHA
40-
webkit 525.19 Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.19 (KHTML, like Gecko) Chrome/1.0.154.36 Safari/525.19
41-
webkit 525.19 Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.19 (KHTML, like Gecko) Chrome/1.0.154.53 Safari/525.19
40+
chrome 525.19 Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.19 (KHTML, like Gecko) Chrome/1.0.154.36 Safari/525.19
41+
chrome 525.19 Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.19 (KHTML, like Gecko) Chrome/1.0.154.53 Safari/525.19
4242
mozilla 1.9.0.10 Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042815 Firefox/3.0.10 CometBird/3.0.10
4343
mozilla 1.9.0.5 Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.0.5) Gecko/2009011615 Firefox/3.0.5 CometBird/3.0.5
4444
msie 7.0 Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727; Crazy Browser 3.0.0 Beta2)

0 commit comments

Comments
 (0)