From d40f41a402cfdb29923af3437497db0e5cee88e7 Mon Sep 17 00:00:00 2001 From: LaGrosseAnglaise Date: Thu, 3 Jul 2014 10:59:54 -0400 Subject: [PATCH] fixed rebase for relative paths When assetBaseUrl is given a value that has '..' in the path, the .. was being stripped out. This was preventing an explicit relative override. The fix is to NOT normalize the assetBaseUrl part of the new url... --- tasks/concat_css.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/concat_css.js b/tasks/concat_css.js index 4b5adaa..76bc082 100644 --- a/tasks/concat_css.js +++ b/tasks/concat_css.js @@ -49,7 +49,7 @@ module.exports = function(grunt) { function dataTransformUrlFunc(basedir) { var bd = basedir; return function(_, b) { - return "url('"+normalize([bd, b].join('/'))+"')"; + return "url('" + [bd, normalize(b)].join('/') + "')"; }; } @@ -57,7 +57,7 @@ module.exports = function(grunt) { function dataTransformImportAlternateFunc(basedir) { var bd = basedir; return function(_, b) { - return "@import url('"+normalize([bd, b].join('/'))+"')"; + return "@import url('" + [bd, normalize(b)].join('/') + "')"; }; }