Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4660 from ryantm/serversideonly 

add more SERVER_SIDE_ONLY routes; use pathname in matching
This commit is contained in:
Robin Ward 2017-01-17 13:55:40 -05:00 committed by GitHub
parent 11641fb3cd f641655f1b
commit 0c71e37aab
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/lib/url.js.es6
View File

@ -7,10 +7,15 @@ const TOPIC_REGEXP = /\/t\/([^\/]+)\/(\d+)\/?(\d+)?/;
// We can add links here that have server side responses but not client side. // We can add links here that have server side responses but not client side.
const SERVER_SIDE_ONLY = [ const SERVER_SIDE_ONLY = [
/^\/assets\//,
/^\/uploads\//,
/^\/stylesheets\//,
/^\/site_customizations\//,
/^\/raw\//,
/^\/posts\/\d+\/raw/, /^\/posts\/\d+\/raw/,
/^\/raw\/\d+/, /^\/raw\/\d+/,
/\.rss$/, /\.rss$/,
/\.json/, /\.json$/,
]; ];
let _jumpScheduled = false; let _jumpScheduled = false;
@ -122,8 +127,9 @@ const DiscourseURL = Ember.Object.extend({
return; return;
} }
const pathname = path.replace(/(https?\:)?\/\/[^\/]+/, '');
const serverSide = SERVER_SIDE_ONLY.some(r => { const serverSide = SERVER_SIDE_ONLY.some(r => {
if (path.match(r)) { if (pathname.match(r)) {
document.location = path; document.location = path;
return true; return true;
} }