diff --git a/ChangeLog b/ChangeLog index cfdaf486c5..e7f6278e9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - issue #13323 Fixed wrong encoding of table at triggers - issue #12976 Fixed natural sorting in several places - issue #12718 Show warning for users removed from mysql.user table +- issue #13362 Fixed loading additional javascripts 4.7.1 (2017-05-25) - issue #13132 Always execute tracking queries as controluser diff --git a/js/ajax.js b/js/ajax.js index 73427c8fa3..007c7085f4 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -573,13 +573,19 @@ var AJAX = { needRequest = true; this.add(script); request.push("scripts%5B%5D=" + script); + if (request.length >= 10) { + // Download scripts in chunks + this.appendScript(request); + request = []; + needRequest = false; + } } } request.push("call_done=1"); request.push("v=" + encodeURIComponent(PMA_commonParams.get('PMA_VERSION'))); // Download the composite js file, if necessary if (needRequest) { - this.appendScript("js/get_scripts.js.php?" + request.join("&")); + this.appendScript(request); } else { self.done(callback); } @@ -606,11 +612,14 @@ var AJAX = { * * @return void */ - appendScript: function (url) { + appendScript: function (request) { var head = document.head || document.getElementsByTagName('head')[0]; var script = document.createElement('script'); + + request.push("call_done=1"); + request.push("v=" + encodeURIComponent(PMA_commonParams.get('PMA_VERSION'))); script.type = 'text/javascript'; - script.src = url; + script.src = "js/get_scripts.js.php?" + request.join("&"); script.async = false; head.appendChild(script); },