Merge pull request #697 from ethereum/fixImport

Fix import

Merge pull request #697 from ethereum/fixImport
8c0d3417 · yann300 · GitHub · fa34ec91 · 15039380 · 8c0d3417
Commit 8c0d3417 authored Aug 17, 2017 by yann300 Committed by GitHub Aug 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

compiler.js src/app/compiler/compiler.js +6 -1

No files found.
--- a/src/app/compiler/compiler.js
+++ b/src/app/compiler/compiler.js
@@ -236,7 +236,12 @@ function Compiler (handleImportCall) {
      while ((match = importRegex.exec(files[fileName]))) {
        var importFilePath = match[1]
        if (importFilePath.startsWith('./')) {
-          importFilePath = importFilePath.slice(2)
+          var path = /(.*\/).*/.exec(target)
+          if (path !== null) {
+            importFilePath = importFilePath.replace('./', path[1])
+          } else {
+            importFilePath = importFilePath.slice(2)
+          }
        }

        // FIXME: should be using includes or sets, but there's also browser compatibility..