deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Made some minor fixes to how content-type and context is handled on remote XML files.

Browse source
This commit is contained in:
John Resig 2006-08-17 05:11:34 +00:00
parent 5ec5de6953
commit 26580d2675
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ajax/ajax.js
View file

@ -264,8 +264,8 @@ jQuery.extend({
// otherwise return plain text. // otherwise return plain text.
httpData: function(r,type) { httpData: function(r,type) {
var ct = r.getResponseHeader("content-type"); var ct = r.getResponseHeader("content-type");
var data = ( !type || type == "xml" ) && ct && ct.indexOf("xml") >= 0; var data = !type && ct && ct.indexOf("xml") >= 0;
data = data ? r.responseXML : r.responseText; data = type == "xml" || data ? r.responseXML : r.responseText;
// If the type is "script", eval it // If the type is "script", eval it
if ( type == "script" ) eval.call( window, data ); if ( type == "script" ) eval.call( window, data );

6
src/jquery/jquery.js vendored
View file

@ -59,12 +59,10 @@ function jQuery(a,c) {
*/ */
// Watch for when a jQuery object is passed as the selector // Watch for when a jQuery object is passed as the selector
if ( a.jquery ) if ( a.jquery ) return a;
return a;
// Watch for when a jQuery object is passed at the context // Watch for when a jQuery object is passed at the context
if ( c && c.jquery ) if ( c && c.jquery ) return c.find(a);
return jQuery(c.get()).find(a);
// If the context is global, return a new object // If the context is global, return a new object
if ( window == this ) if ( window == this )