antville/antville
antville/antville
1
1
Fork 0
Code Issues 51 Pull requests 9 Projects Releases 9 Wiki Activity Actions

Removed redundant port number as well as slashes when building URL

Browse source
This commit is contained in:
Tobi Schäfer 2012-06-04 19:43:10 +00:00
parent 27581de76b
commit d2f82bfa98
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
code/Site/Site.js
View file

@ -943,14 +943,14 @@ Site.prototype.getDiskSpace = function(quota) {
Site.prototype.processHref = function(href) { Site.prototype.processHref = function(href) {
var parts, domain, var parts, domain,
scheme = (req.servletRequest ? req.servletRequest.scheme : 'http') + '://'; scheme = (req.servletRequest ? req.servletRequest.scheme : 'http') + '://';
port = req.servletRequest.serverPort;
port = (port === 80 ? '' : ':' + port);
if (domain = getProperty('domain.' + this.name)) { if (domain = getProperty('domain.' + this.name)) {
parts = [scheme, domain, port, href]; parts = [scheme, domain, port, href];
} else if (domain = getProperty('domain.*')) { } else if (domain = getProperty('domain.*')) {
parts = [scheme, this.name, '.', domain, port, href]; parts = [scheme, this.name, '.', domain, port, href];
} else { } else {
parts = [scheme, req.data.http_host, port, app.appsProperties.mountPoint, href]; var mountpoint = app.appsProperties.mountpoint;
(mountpoint === '/') && (mountpoint = ''); // Prevents double slashes
parts = [scheme, req.data.http_host, mountpoint, href];
} }
return parts.join(''); return parts.join('');
} }
@ -1006,13 +1006,11 @@ Site.prototype.getStaticFile = function(tail) {
*/ */
Site.prototype.getStaticUrl = function(href) { Site.prototype.getStaticUrl = function(href) {
href || (href = ''); href || (href = '');
var scheme = (req.servletRequest ? req.servletRequest.scheme : 'http') + '://', var scheme = (req.servletRequest ? req.servletRequest.scheme : 'http') + '://';
port = req.servletRequest.serverPort; var host = getProperty('domain.' + this.name);
port = (port === 80 ? '' : ':' + port); host || (host = getProperty('domain.*'));
var domain = getProperty('domain.' + this.name); host || (host = req.data.http_host);
domain || (domain = getProperty('domain.*')); return ['//', host, app.appsProperties.staticMountpoint, '/', this.name, '/', href].join('');
domain || (domain = req.data.http_host);
return ['//', domain, port, app.appsProperties.staticMountpoint, '/', this.name, '/', href].join('');
} }
/** /**