colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-28 06:27:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'loader' of git@github.com:280north/cappuccino into loader

Browse Source
This commit is contained in:
Tom Robinson
2010-02-10 00:49:11 -08:00
parent 99a839456d 5a031efa7a
commit fbcd2b3174
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Objective-J/Scope.js
+1 -1
View File
@@ -15,7 +15,7 @@ function importablePath(/*String*/ aPath, /*BOOL*/ isLocal, /*String*/ aCWD)
return aPath;
if (isLocal)
aPath = FILE.join(aCWD, aPath);
aPath = FILE.normal(FILE.join(aCWD, aPath));
return aPath;
}
Objective-J/StaticResourceNode.js
+3 -3
View File
@@ -65,9 +65,9 @@ require("file");
if (resultsCount > 0 && results[resultsCount - 1] !== "..")
results.pop();
// If we are at the beginning and this isn't a root listing,
// add it since it makes sense for relative paths.
else if (!isRoot && resultsCount < 0)
// If this isn't a root listing, and we are preceded by only ..'s, or
// nothing at all, then add it since it makes sense for relative paths.
else if (!isRoot && resultsCount === 0 || results[resultsCount - 1] === "..")
results.push(component);
}