Merge PR twigjs#157 and rebuild

lawrencec · Jun 10, 2014 · 87451dc · 87451dc
2 parents efe781c + 6687740
commit 87451dc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/src/twig.core.js b/src/twig.core.js
@@ -1010,6 +1010,7 @@ var Twig = (function (Twig) {
             var path = require("path"),
                 sep = path.sep || sep_chr,
                 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
@@ -1024,6 +1024,7 @@ var Twig = (function (Twig) {
             var path = require("path"),
                 sep = path.sep || sep_chr,
                 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.min.js b/twig.min.js
diff --git a/twig.min.js.map b/twig.min.js.map