Skip to content

Commit

Permalink
fix(config): do not change urlRoot even if proxied
Browse files Browse the repository at this point in the history
  • Loading branch information
vojtajina committed Mar 13, 2013
1 parent 50be0fa commit 8c138b5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ var normalizeConfig = function(config) {
config.urlRoot = urlRoot;
}

if (config.proxies && config.proxies.hasOwnProperty('/') && config.urlRoot === '/') {
log.warn('urlRoot set to /__testacualar__/ because of "/" proxy');
config.urlRoot = '/__testacualar__/';
if (config.proxies && config.proxies.hasOwnProperty(config.urlRoot)) {
log.warn('"%s" is proxied, you should probably change urlRoot to avoid conflicts',
config.urlRoot);
}

if (config.singleRun && config.autoWatch) {
Expand Down

2 comments on commit 8c138b5

@geddski
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this. I'll upgrade Angular build as soon as you cut the new release.

@vojtajina
Copy link
Contributor Author

@vojtajina vojtajina commented on 8c138b5 Mar 20, 2013 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.