From 1638d5cefb30a09965df1b1e602c463aaaab0c5d Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 18 Feb 2020 19:31:54 +0800 Subject: [PATCH 1/2] Make sure the script is executed before the callback method. --- npm/packs/jquery/src/abp.jquery.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/npm/packs/jquery/src/abp.jquery.js b/npm/packs/jquery/src/abp.jquery.js index bf4c920815..ece722404d 100644 --- a/npm/packs/jquery/src/abp.jquery.js +++ b/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) { + jQuery.globalEval(script); + urlInfo.succeed(); + }) + .fail(function () { + urlInfo.failed(); + }); }); }; From 561be154db196f6e0ed5c6b4187cdf47d8f91cde Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 18 Feb 2020 19:36:54 +0800 Subject: [PATCH 2/2] Use $ instead of jQuery. --- npm/packs/jquery/src/abp.jquery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/packs/jquery/src/abp.jquery.js b/npm/packs/jquery/src/abp.jquery.js index ece722404d..76f54df1a0 100644 --- a/npm/packs/jquery/src/abp.jquery.js +++ b/npm/packs/jquery/src/abp.jquery.js @@ -364,7 +364,7 @@ dataType: 'text' }) .done(function (script) { - jQuery.globalEval(script); + $.globalEval(script); urlInfo.succeed(); }) .fail(function () {