Skip to content

Commit

Permalink
Merge pull request #1981 from kolipka/master
Browse files Browse the repository at this point in the history
fix bug with ../.. paths joining
  • Loading branch information
lukeapage committed May 4, 2014
2 parents 85b911a + 66c4307 commit 1ccb489
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build/rhino-modules.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
var result = [];
for (i in parts) {
var part = parts[i];
if (part === '..' && result.length > 0) {
if (part === '..' && result.length > 0 && result[result.length-1] !== '..') {
result.pop();
} else if (part === '' && result.length > 0) {
// skip
Expand Down

0 comments on commit 1ccb489

Please sign in to comment.