fix windows path relative

lawrencec · May 19, 2014 · 6687740 · 6687740
1 parent a3bdd59
commit 6687740
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/twig.core.js b/src/twig.core.js
@@ -1009,7 +1009,8 @@ var Twig = (function (Twig) {
             // Get the system-specific path separator
             var path = require("path"),
                 sep = path.sep || sep_chr,
-                relative = new RegExp("^\\.{1,2}(?:\\\\|/)");
+                relative = new RegExp("^\\.{1,2}" + sep.replace("\\", "\\\\"));
+            file = file.replace(/\//g, sep);
 
             if (template.base !== undefined && file.match(relative) == null) {
                 file = file.replace(template.base, '');

diff --git a/twig.js b/twig.js
@@ -1023,7 +1023,8 @@ var Twig = (function (Twig) {
             // Get the system-specific path separator
             var path = require("path"),
                 sep = path.sep || sep_chr,
-                relative = new RegExp("^\\.{1,2}(?:\\\\|/)");
+                relative = new RegExp("^\\.{1,2}" + sep.replace("\\", "\\\\"));
+            file = file.replace(/\//g, sep);
 
             if (template.base !== undefined && file.match(relative) == null) {
                 file = file.replace(template.base, '');