aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Irish <paul.irish@gmail.com>2010-01-12 11:32:06 +0800
committerJohn Resig <jeresig@gmail.com>2010-01-12 11:42:31 +0800
commit7be5ec1248c749ece648c8d80a71b45320556381 (patch)
tree254bc70368d9cb30062d3797cfad0f2aa332b4ba
parentf14fadef7311ace7333b6522d4b6f44a9e54d6dc (diff)
downloadjquery-7be5ec1248c749ece648c8d80a71b45320556381.tar.gz
jquery-7be5ec1248c749ece648c8d80a71b45320556381.zip
browser version detection revised for opera >= 10, which was reporting itself as 9.8 due to their new policy
-rw-r--r--src/core.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core.js b/src/core.js
index bcabc646e..467895f74 100644
--- a/src/core.js
+++ b/src/core.js
@@ -661,8 +661,8 @@ jQuery.extend({
ret = { browser: "webkit", version: /webkit[\/ ]([\w.]+)/ };
} else if ( /opera/.test( ua ) ) {
- ret = { browser: "opera", version: /opera[\/ ]([\w.]+)/ };
-
+ ret = { browser: "opera", version: /version/.test( ua ) ? /version[\/ ]([\w.]+)/ : /opera[\/ ]([\w.]+)/ };
+
} else if ( /msie/.test( ua ) ) {
ret = { browser: "msie", version: /msie ([\w.]+)/ };