[Pkg-javascript-commits] [dojo] 61/88: Fix adding the callback to the URL (1.8 backport). refs #16408 !strict

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.8.5
in repository dojo.

commit eef5a822af2f8d9ea6ca94dd51d785418e9af3f8
Author: Bryan Forbes <bryan at reigndropsfall.net>
Date:   Thu Jan 17 23:12:58 2013 +0000

    Fix adding the callback to the URL (1.8 backport). refs #16408 !strict
    
    git-svn-id: http://svn.dojotoolkit.org/src/branches/1.8/dojo@30391 560b804f-0ae3-0310-86f3-f6aa0a117693
---
 request/script.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/request/script.js b/request/script.js
index 16a2a68..b0ee148 100644
--- a/request/script.js
+++ b/request/script.js
@@ -131,7 +131,8 @@ define([
 		if(options.jsonp){
 			var queryParameter = new RegExp('[?&]' + options.jsonp + '=');
 			if(!queryParameter.test(url)){
-				url += queryParameter +
+				url += (~url.indexOf('?') ? '&' : '?') +
+					options.jsonp + '=' +
 					(options.frameDoc ? 'parent.' : '') +
 					mid + '_callbacks.' + dfd.id;
 			}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git