Version 1.0.1

Fixed issue with JSONP callback parameter within a JSON query
kylebarrow · Oct 7, 2012 · f996d1e · f996d1e
1 parent 9993c62
commit f996d1e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Chibi v1.0
+# Chibi v1.0.1
 
 #### A tiny JavaScript micro-framework
 
@@ -432,7 +432,8 @@ For cross-domain requests, **ajax** uses JSONP by default but this can be overri
 </head>
 <body>
 <script>
-	$({sort:'created',direction:'asc'}).ajax('https://api.github.com/users/kylebarrow/repos?callback=?','GET',function(data,status){ }); // JSONP
+	$().ajax('https://api.github.com/users/kylebarrow/repos?sort=created&direction=asc&callback=?','GET',function(data,status){ }); // JSONP
+	$({sort: "created", direction: "asc", callback: "?"}).ajax('https://api.github.com/users/kylebarrow/repos','GET',function(data,status){ }); // JSONP with JSON query
 </script>
 </body>
 </html>

diff --git a/chibi-min.js b/chibi-min.js
diff --git a/chibi.js b/chibi.js
@@ -1,4 +1,4 @@
-/*Chibi v1.0, Copyright (C) 2012 Kyle Barrow
+/*Chibi v1.0.1, Copyright (C) 2012 Kyle Barrow
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -697,6 +697,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 						url += '&' + timestamp;
 					}
 
+					// Replace possible encoded ?
+					url = url.replace('=%3F', '=?');
+
 					// Replace jsonp ? with callback
 					if (callback && url.indexOf('=?') !== -1) {
 
@@ -709,10 +712,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 						};
 					}
 
+					// JSONP
 					script = document.createElement('script');
 					script.async = 'async';
 					script.src = url;
 
+					// Tidy up
 					script.onload = function () {
 						head.removeChild(script);
 					};