github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 14:12:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't load JS via SCRIPT tag in QUnit mode

Browse Source
This commit is contained in:
Robin Ward
2017-05-31 15:31:24 -04:00
parent e22d88c91d
commit e66fa82f3a
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/lib/load-script.js.es6
View File

@ -35,6 +35,11 @@ export default function loadScript(url, opts) {
opts = opts || {};
$('script').each((i, tag) => {
_loaded[tag.getAttribute('src')] = true;
});
return new Ember.RSVP.Promise(function(resolve) {
url = Discourse.getURL(url);
@ -42,7 +47,7 @@ export default function loadScript(url, opts) {
if (_loaded[url]) { return resolve(); }
if (_loading[url]) { return _loading[url].then(resolve);}
var done;
let done;
_loading[url] = new Ember.RSVP.Promise(function(_done){
done = _done;
});
@ -60,7 +65,7 @@ export default function loadScript(url, opts) {
resolve();
};
var cdnUrl = url;
let cdnUrl = url;
// Scripts should always load from CDN
// CSS is type text, to accept it from a CDN we would need to handle CORS
@ -72,6 +77,9 @@ export default function loadScript(url, opts) {
// to dynamically load more JS. In that case, add the `scriptTag: true`
// option.
if (opts.scriptTag) {
if (Ember.Test) {
throw `In test mode scripts cannot be loaded async ${cdnUrl}`;
}
loadWithTag(cdnUrl, cb);
} else {
ajax({url: cdnUrl, dataType: opts.css ? "text": "script", cache: true}).then(cb);