From dd93d0eb32dc638ff3319792a885acd6d3c25c30 Mon Sep 17 00:00:00 2001 From: rwldrn Date: Mon, 20 Jun 2011 09:41:53 -0400 Subject: [PATCH] Begrudgingly adds chrome detection to jQuery.browser (1.7). Fixes #9385 --- src/core.js | 4 +++- test/data/ua.txt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core.js b/src/core.js index ab0d9f7b5..2f5ac426a 100644 --- a/src/core.js +++ b/src/core.js @@ -39,6 +39,7 @@ var jQuery = function( selector, context ) { rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, // Useragent RegExp + rchrome = /(chrome)[ \/]([\w.]+)/, rwebkit = /(webkit)[ \/]([\w.]+)/, ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/, rmsie = /(msie) ([\w.]+)/, @@ -829,7 +830,8 @@ jQuery.extend({ uaMatch: function( ua ) { ua = ua.toLowerCase(); - var match = rwebkit.exec( ua ) || + var match = rchrome.exec( ua ) || + rwebkit.exec( ua ) || ropera.exec( ua ) || rmsie.exec( ua ) || ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) || diff --git a/test/data/ua.txt b/test/data/ua.txt index b6a9dff66..2832c36ee 100644 --- a/test/data/ua.txt +++ b/test/data/ua.txt @@ -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 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 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 webkit 419 Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/419 (KHTML, like Gecko, Safari/419.3) Cheshire/1.0.ALPHA -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 -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 +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 +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 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 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 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) -- 2.39.5