Skip to content
Permalink
Browse files

Makes sure all converters keys are lowercased before any conversion i…

…s taking place: dataTypes' names are now truly case insensitive. Unit test edited.
  • Loading branch information...
jaubourg committed Jan 31, 2011
1 parent 485fa0c commit 7c9a5e6016c2fcd38872367a891e5b3887d3df53
Showing with 16 additions and 5 deletions.
  1. +12 −1 src/ajax.js
  2. +4 −4 test/unit/ajax.js
@@ -842,8 +842,9 @@ function ajaxConvert( s, response ) {
}

var dataTypes = s.dataTypes,
converters = s.converters,
converters = {},
i,
key,
length = dataTypes.length,
tmp,
// Current and previous dataTypes
@@ -860,6 +861,16 @@ function ajaxConvert( s, response ) {
// For each dataType in the chain
for( i = 1; i < length; i++ ) {

// Create converters map
// with lowercased keys
if ( i === 1 ) {
for( key in s.converters ) {
if( typeof key === "string" ) {
converters[ key.toLowerCase() ] = s.converters[ key ];
}
}
}

// Get the dataTypes
prev = current;
current = dataTypes[ i ];
@@ -2077,12 +2077,12 @@ test("jQuery.ajax - transitive conversions", function() {

jQuery.ajax( url("data/json.php") , {
converters: {
"json myjson": function( data ) {
"json myJson": function( data ) {
ok( true , "converter called" );
return data;
}
},
dataType: "myjson",
dataType: "myJson",
success: function() {
ok( true , "Transitive conversion worked" );
strictEqual( this.dataTypes[0] , "text" , "response was retrieved as text" );
@@ -2092,13 +2092,13 @@ test("jQuery.ajax - transitive conversions", function() {

jQuery.ajax( url("data/json.php") , {
converters: {
"json myjson": function( data ) {
"json myJson": function( data ) {
ok( true , "converter called (*)" );
return data;
}
},
contents: false, /* headers are wrong so we ignore them */
dataType: "* myjson",
dataType: "* myJson",
success: function() {
ok( true , "Transitive conversion worked (*)" );
strictEqual( this.dataTypes[0] , "text" , "response was retrieved as text (*)" );

0 comments on commit 7c9a5e6

Please sign in to comment.
You can’t perform that action at this time.