git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplified some of the logic for handling the ajax aborts, making sure that ajaxStop...
[jquery.git]
/
src
/
core.js
diff --git
a/src/core.js
b/src/core.js
index
bcabc64
..
467895f
100644
(file)
--- 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: "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.]+)/ };
} else if ( /msie/.test( ua ) ) {
ret = { browser: "msie", version: /msie ([\w.]+)/ };