git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5ca8f06
)
Fixes #8054 by reverting feature enhancement 5812 (4920). Regexps no longer searches...
author
jaubourg
<j@ubourg.net>
Tue, 25 Jan 2011 23:55:39 +0000
(
00:55
+0100)
committer
jaubourg
<j@ubourg.net>
Tue, 25 Jan 2011 23:55:39 +0000
(
00:55
+0100)
src/ajax/jsonp.js
patch
|
blob
|
history
test/unit/ajax.js
patch
|
blob
|
history
diff --git
a/src/ajax/jsonp.js
b/src/ajax/jsonp.js
index
f5742d9
..
16a4c2f
100644
(file)
--- a/
src/ajax/jsonp.js
+++ b/
src/ajax/jsonp.js
@@
-1,7
+1,7
@@
(function( jQuery ) {
var jsc = jQuery.now(),
(function( jQuery ) {
var jsc = jQuery.now(),
- jsre = /(\=)(?:\?|%3F)(&|$)|()(?:\?\?|%3F%3F)()/i;
+ jsre = /(\=)\?(&|$)|()\?\?()/i;
// Default jsonp settings
jQuery.ajaxSetup({
// Default jsonp settings
jQuery.ajaxSetup({
diff --git
a/test/unit/ajax.js
b/test/unit/ajax.js
index
d018372
..
abe90c8
100644
(file)
--- a/
test/unit/ajax.js
+++ b/
test/unit/ajax.js
@@
-1199,10
+1199,10
@@
test("jQuery.getScript(String, Function) - no callback", function() {
jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) {
test("jQuery.ajax() - JSONP, " + label, function() {
jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) {
test("jQuery.ajax() - JSONP, " + label, function() {
- expect(17);
+ expect(16);
var count = 0;
var count = 0;
- function plus(){ if ( ++count == 17 ) start(); }
+ function plus(){ if ( ++count == 16 ) start(); }
stop();
stop();
@@
-1310,23
+1310,6
@@
jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label )
url: "data/jsonp.php",
dataType: "jsonp",
crossDomain: crossDomain,
url: "data/jsonp.php",
dataType: "jsonp",
crossDomain: crossDomain,
- data: {
- callback: "?"
- },
- success: function(data){
- ok( data.data, "JSON results returned (GET, processed data callback)" );
- plus();
- },
- error: function(data){
- ok( false, "Ajax error JSON (GET, processed data callback)" );
- plus();
- }
- });
-
- jQuery.ajax({
- url: "data/jsonp.php",
- dataType: "jsonp",
- crossDomain: crossDomain,
jsonp: "callback",
success: function(data){
ok( data.data, "JSON results returned (GET, data obj callback)" );
jsonp: "callback",
success: function(data){
ok( data.data, "JSON results returned (GET, data obj callback)" );