Simplification of uaMatch, based upon the patch by Ben Alman.

diff --git a/src/core.js b/src/core.js
index 5b8388eada3bc242c11062d57b7aba7b6245cf23..4102e5c8ccce75952b608704db6da175b5380eea 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -653,26 +653,15 @@ jQuery.extend({
        // Use of jQuery.browser is frowned upon.
        // More details: http://docs.jquery.com/Utilities/jQuery.browser
        uaMatch: function( ua ) {
-               var ret = { browser: "" };
-
                ua = ua.toLowerCase();
 
-               if ( /webkit/.test( ua ) ) {
-                       ret = { browser: "webkit", version: /webkit[\/ ]([\w.]+)/ };
-
-               } else if ( /opera/.test( ua ) ) {
-                       ret = { browser: "opera", version:  /version/.test( ua ) ? /version[\/ ]([\w.]+)/ : /opera[\/ ]([\w.]+)/ };
-                       
-               } else if ( /msie/.test( ua ) ) {
-                       ret = { browser: "msie", version: /msie ([\w.]+)/ };
+               var match = /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+                       /(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) ||
+                       /(msie) ([\w.]+)/.exec( ua ) ||
+                       !/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) ||
+                       [];
 
-               } else if ( /mozilla/.test( ua ) && !/compatible/.test( ua ) ) {
-                       ret = { browser: "mozilla", version: /rv:([\w.]+)/ };
-               }
-
-               ret.version = (ret.version && ret.version.exec( ua ) || [0, "0"])[1];
-
-               return ret;
+               return { browser: match[1] || "", version: match[2] || "0" };
        },
 
        browser: {}