fragment urls referencing just a fragment are assumed absolute - refe…

…rencing the current page. Fixes #2320
less · Feb 2, 2015 · 2114a3f · 2114a3f
1 parent fb5280f
commit 2114a3f
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 3 deletions.
diff --git a/lib/less/contexts.js b/lib/less/contexts.js
@@ -77,7 +77,7 @@ contexts.Eval.prototype.isMathOn = function () {
 };
 
 contexts.Eval.prototype.isPathRelative = function (path) {
- return !/^(?:[a-z-]+:|\/)/i.test(path);
+ return !/^(?:[a-z-]+:|\/|#)/i.test(path);
 };
 
 contexts.Eval.prototype.normalizePath = function( path ) {

diff --git a/lib/less/environment/abstract-file-manager.js b/lib/less/environment/abstract-file-manager.js
@@ -29,7 +29,7 @@ abstractFileManager.prototype.alwaysMakePathsAbsolute = function() {
 };
 
 abstractFileManager.prototype.isPathAbsolute = function(filename) {
- return (/^(?:[a-z-]+:|\/|\\)/i).test(filename);
+ return (/^(?:[a-z-]+:|\/|\\|#)/i).test(filename);
 };
 
 abstractFileManager.prototype.join = function(basePath, laterPath) {

diff --git a/test/browser/css/relative-urls/urls.css b/test/browser/css/relative-urls/urls.css
@@ -15,6 +15,7 @@
 }
 #misc {
  background-image: url(http://localhost:8081/test/browser/less/relative-urls/images/image.jpg);
+ background: url("#inline-svg");
 }
 #data-uri {
  background: url(data:image/png;charset=utf-8;base64,

diff --git a/test/browser/less/relative-urls/urls.less b/test/browser/less/relative-urls/urls.less
@@ -10,6 +10,7 @@
 }
 #misc {
  background-image: url(images/image.jpg);
+ background: url("#inline-svg");
 }
 #data-uri {
  background: url(data:image/png;charset=utf-8;base64,

diff --git a/test/css/import-interpolation.css b/test/css/import-interpolation.css
@@ -5,6 +5,7 @@ body {
  width: 100px;
  height: 100px;
  background: url('../assets/logo.png');
+ background: url("#inline-svg");
 }
 
 .a {

diff --git a/test/css/static-urls/urls.css b/test/css/static-urls/urls.css
@@ -31,6 +31,7 @@
  width: 100px;
  height: 100px;
  background: url('assets/logo.png');
+ background: url("#inline-svg");
 }
 @font-face {
  font-family: xecret;

diff --git a/test/css/urls.css b/test/css/urls.css
@@ -39,6 +39,7 @@
  width: 100px;
  height: 100px;
  background: url('import/assets/logo.png');
+ background: url("#inline-svg");
 }
 @font-face {
  font-family: xecret;

diff --git a/test/less/import/imports/logo.less b/test/less/import/imports/logo.less
@@ -2,4 +2,5 @@
  width: 100px;
  height: 100px;
  background: url('../assets/logo.png');
+ background: url("#inline-svg");
 }
diff --git a/test/less/urls.less b/test/less/urls.less
@@ -47,7 +47,7 @@
  uri: data-uri('image/jpeg;base64', '../data/image.jpg');
  @var: replace('../data/replace.jpg', "replace", "image");
  background-image: data-uri(@var), data-uri(replace('../data/image.filext', "filext", "jpg"));
- 
+
  uri-fragment: data-uri('image/jpeg;base64', '../data/image.jpg#fragment');
 }