git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 3.2.1 - Released 04/27/2010
[extjs.git]
/
src
/
adapter
/
jquery-bridge.js
diff --git
a/src/adapter/jquery-bridge.js
b/src/adapter/jquery-bridge.js
index
4fcf012
..
5e908ce
100644
(file)
--- a/
src/adapter/jquery-bridge.js
+++ b/
src/adapter/jquery-bridge.js
@@
-1,6
+1,6
@@
/*!
/*!
- * Ext JS Library 3.
0.3
- * Copyright(c) 2006-20
09 Ext JS, LLC
+ * Ext JS Library 3.
2.1
+ * Copyright(c) 2006-20
10 Ext JS, Inc.
* licensing@extjs.com
* http://www.extjs.com/license
*/
* licensing@extjs.com
* http://www.extjs.com/license
*/
@@
-24,7
+24,7
@@
Ext.lib.Dom = {
isAncestor : function(p, c){
var ret = false;
isAncestor : function(p, c){
var ret = false;
-
+
p = Ext.getDom(p);
c = Ext.getDom(c);
if (p && c) {
p = Ext.getDom(p);
c = Ext.getDom(c);
if (p && c) {
@@
-34,10
+34,10
@@
Ext.lib.Dom = {
return !!(p.compareDocumentPosition(c) & 16);
} else {
while (c = c.parentNode) {
return !!(p.compareDocumentPosition(c) & 16);
} else {
while (c = c.parentNode) {
- ret = c == p || ret;
+ ret = c == p || ret;
}
}
- }
- }
+ }
+ }
return ret;
},
return ret;
},
@@
-265,15
+265,15
@@
Ext.lib.Ajax = function(){
}
};
};
}
};
};
-
+
var createResponse = function(cb, xhr){
var headerObj = {},
var createResponse = function(cb, xhr){
var headerObj = {},
- headerStr,
+ headerStr,
t,
s;
try {
t,
s;
try {
- headerStr = xhr.getAllResponseHeaders();
+ headerStr = xhr.getAllResponseHeaders();
Ext.each(headerStr.replace(/\r\n/g, '\n').split('\n'), function(v){
t = v.indexOf(':');
if(t >= 0){
Ext.each(headerStr.replace(/\r\n/g, '\n').split('\n'), function(v){
t = v.indexOf(':');
if(t >= 0){
@@
-285,7
+285,7
@@
Ext.lib.Ajax = function(){
}
});
} catch(e) {}
}
});
} catch(e) {}
-
+
return {
responseText: xhr.responseText,
responseXML : xhr.responseXML,
return {
responseText: xhr.responseText,
responseXML : xhr.responseXML,
@@
-455,9
+455,10
@@
Ext.lib.Anim = function(){
if (args.top.from)
e.setTop(args.top.from);
break;
if (args.top.from)
e.setTop(args.top.from);
break;
+ // jQuery can't handle callback, scope, and xy arguments, so break here
case 'callback':
case 'scope':
case 'callback':
case 'scope':
- // jQuery can't handle callback and scope arguments, so break here
+ case 'xy':
break;
default:
break;
default: