Browse Source
Merge pull request #2854 from abpframework/maliming/abp-jquery-script
Make sure the script is executed before the callback method.
pull/2861/head
Alper Ebicoglu
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
11 additions and
7 deletions
-
npm/packs/jquery/src/abp.jquery.js
|
|
|
@ -359,13 +359,17 @@ |
|
|
|
|
|
|
|
var _loadScript = function (url, loadCallback, failCallback) { |
|
|
|
_loadFromUrl(url, loadCallback, failCallback, function (urlInfo) { |
|
|
|
$.getScript(url) |
|
|
|
.done(function () { |
|
|
|
urlInfo.succeed(); |
|
|
|
}) |
|
|
|
.fail(function () { |
|
|
|
urlInfo.failed(); |
|
|
|
}); |
|
|
|
$.get({ |
|
|
|
url: url, |
|
|
|
dataType: 'text' |
|
|
|
}) |
|
|
|
.done(function (script) { |
|
|
|
$.globalEval(script); |
|
|
|
urlInfo.succeed(); |
|
|
|
}) |
|
|
|
.fail(function () { |
|
|
|
urlInfo.failed(); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}; |
|
|
|
|
|
|
|
|