Permalink
Browse files

Reverted fs paths in url rs addon

  • Loading branch information...
1 parent 4fd0351 commit 7a1b21ce4267d4579cd14a0dbe6ac5860d36d693 @mridgway mridgway committed Sep 5, 2012
Showing with 4 additions and 4 deletions.
  1. +3 −3 lib/app/addons/rs/url.server.js
  2. +1 −1 lib/store.server.js
@@ -176,7 +176,7 @@ YUI.add('addon-rs-url', function(Y, NAME) {
rollupParts = [],
rollupFsPath;
- // Fix windows paths
+ // Translate from filesystem path to URL
if ('win32' === process.platform) {
relativePath = relativePath.replace(/\\/g, '/');
}
@@ -207,7 +207,7 @@ YUI.add('addon-rs-url', function(Y, NAME) {
rollupParts.push(this.config.appName);
}
rollupParts.push('rollup.client.js');
- rollupFsPath = [this.appRoot, 'rollup.client.js'].join('/');
+ rollupFsPath = libpath.join(this.appRoot, 'rollup.client.js');
}
} else {
if ('mojit' === res.type) {
@@ -218,7 +218,7 @@ YUI.add('addon-rs-url', function(Y, NAME) {
if (res.yui && res.yui.name) {
rollupParts.push(res.mojit);
rollupParts.push('rollup.client.js');
- rollupFsPath = [mojitRes.source.fs.fullPath, 'rollup.client.js'].join('/');
+ rollupFsPath = libpath.join(mojitRes.source.fs.fullPath, 'rollup.client.js');
}
}
View
@@ -107,6 +107,7 @@ YUI.add('mojito-resource-store', function(Y, NAME) {
libs.semver = require('semver');
libs.walker = require('./package-walker.server');
+
// The Affinity object is to manage the use of the affinity string in
// filenames. Some files have affinities that have multiple parts
// (e.g. "server-tests").
@@ -992,7 +993,6 @@ YUI.add('mojito-resource-store', function(Y, NAME) {
if (!fs.isFile && fs.subDirArray.length < 2 && 'addons' === fs.subDirArray[0]) {
return true;
}
-
if (fs.isFile && fs.subDirArray.length >= 1 && 'addons' === fs.subDirArray[0]) {
if ('.js' !== fs.ext) {
return false;

0 comments on commit 7a1b21c

Please sign in to comment.