Merge pull request #2429 from yiiframework-com-ua/master

Fix for multiple $.ajax calls with "JSONP" dataType
This commit is contained in:
Qiang Xue
2014-02-15 09:05:38 -05:00

View File

@ -236,6 +236,9 @@ yii = (function ($) {
return this.src.charAt(0) === '/' ? hostInfo + this.src : this.src; return this.src.charAt(0) === '/' ? hostInfo + this.src : this.src;
}).toArray(); }).toArray();
$.ajaxPrefilter('script', function (options, originalOptions, xhr) { $.ajaxPrefilter('script', function (options, originalOptions, xhr) {
if(options.dataType == 'jsonp') {
return;
}
var url = options.url.charAt(0) === '/' ? hostInfo + options.url : options.url; var url = options.url.charAt(0) === '/' ? hostInfo + options.url : options.url;
if ($.inArray(url, loadedScripts) === -1) { if ($.inArray(url, loadedScripts) === -1) {
loadedScripts.push(url); loadedScripts.push(url);