X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=1beebd17be09d77d98c08617a0f4696058d0e9ce;hb=2d4001b82c6325ac6a767294e96a8af8f920f7cd;hp=79ea5cebcc1b5baa77077dfbcecb5ea0eb674437;hpb=39d96ab8c55a044deccaff0ef8bc2c5813656368;p=jquery.git

diff --git a/src/core.js b/src/core.js
index 79ea5ce..1beebd1 100644
--- a/src/core.js
+++ b/src/core.js
@@ -546,6 +546,28 @@ jQuery.extend({
 			jQuery.error( "Invalid JSON: " + data );
 		}
 	},
+	
+	// Cross-browser xml parsing
+	// (xml & tmp used internally)
+	parseXML: function( data , xml , tmp ) {
+
+		if ( window.DOMParser ) { // Standard
+			tmp = new DOMParser();
+			xml = tmp.parseFromString( data , "text/xml" );
+		} else { // IE
+			xml = new ActiveXObject( "Microsoft.XMLDOM" );
+			xml.async = "false";
+			xml.loadXML( data );
+		}
+		
+		tmp = xml.documentElement;
+		
+		if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+		
+		return xml;
+	},
 
 	noop: function() {},
 
@@ -783,7 +805,7 @@ jQuery.extend({
 	},
 	
 	// Create a simple deferred (one callbacks list)
-	_deferred: function( cancellable ) {
+	_Deferred: function( cancellable ) {
 		
 		// cancellable by default
 		cancellable = cancellable !== false;
@@ -800,7 +822,7 @@ jQuery.extend({
 			deferred  = {
 				
 				// then( f1, f2, ...)
-				then: function() {
+				then: function () {
 					
 					if ( ! cancelled ) {
 					
@@ -879,7 +901,7 @@ jQuery.extend({
 	
 	// Full fledged deferred (two callbacks list)
 	// Typical success/error system
-	deferred: function( func , cancellable ) {
+	Deferred: function( func , cancellable ) {
 		
 		// Handle varargs
 		if ( arguments.length === 1 ) {
@@ -890,8 +912,8 @@ jQuery.extend({
 			}
 		}
 		
-		var errorDeferred = jQuery._deferred( cancellable ),
-			deferred = jQuery._deferred( cancellable ),
+		var errorDeferred = jQuery._Deferred( cancellable ),
+			deferred = jQuery._Deferred( cancellable ),
 			// Keep reference of the cancel method since we'll redefine it
 			cancelThen = deferred.cancel;
 			
@@ -931,7 +953,7 @@ jQuery.extend({
 		method = method || "then";
 		object = jQuery.isDeferred( object , method ) ?
 			object :
-			jQuery.deferred().resolve( object );
+			jQuery.Deferred().resolve( object );
 		object.fail = object.fail || function() { return this; };
 		object[ method ] = object[ method ] || object.then;
 		object.then = object.then || object[ method ];
@@ -957,7 +979,7 @@ jQuery.extend({
 
 // Create readyList deferred
 // also force $.fn.ready to be recognized as a defer
-readyList = jQuery._deferred( false );
+readyList = jQuery._Deferred( false );
 jQuery.fn.ready._ = deferredMarker;
 
 // Populate the class2type map