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

FIX: apply s3 cdn to client side assets

Browse Source
This commit is contained in:
Sam
2015-05-27 12:59:51 +10:00
parent a988cd5abe
commit 24102f2636
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse.js
View File

@ -32,7 +32,12 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
getURLWithCDN: function(url) {
url = this.getURL(url);
if (Discourse.CDN) { url = Discourse.CDN + url; }
// https:// and http:// and // should be skipped, only /xyz is allowed here
if (Discourse.CDN && url[1] !== "/") {
url = Discourse.CDN + url;
} else if (Discourse.S3CDN) {
url = url.replace(Discourse.S3BaseUrl, Discourse.S3CDN);
}
return url;
},