load from tutorial directory when using param true

ShMcK · ShMcK · commit b7cfa59c028b · 2016-04-01T14:32:57.000-07:00
diff --git a/lib/reducers/run-tests/parse-loaders.js b/lib/reducers/run-tests/parse-loaders.js
@@ -2,12 +2,12 @@
 var path = require('path');
 var fs = require('fs');
 var supportedFileTypes = ['js', 'jsx', 'ts', 'py'];
-var js = /^\/\/\s?load\(['"`](.+)['"`]\)$/m;
+var js = /^\/\/\s?load\(['"`](.+)['"`](\,\s?true)?\)/m;
 var loaderMatch = {
     js: js,
     ts: js,
     jsx: js,
-    py: /^#\s?load\(['"`](.+)['"`]\)$/m
+    py: /^#\s?load\(['"`](.+)['"`](,\s?true)?\)/m
 };
 function parseLoaders(data, fileType) {
     if (supportedFileTypes.indexOf(fileType) < 0) {
@@ -26,7 +26,13 @@ function parseLoaders(data, fileType) {
                 console.log("\"" + fileToLoad + "\" already loaded.");
                 continue;
             }
-            var pathToFile = path.normalize(path.join(window.coderoad.dir, fileToLoad));
+            var pathToFile = null;
+            if (loader[2]) {
+                pathToFile = path.normalize(path.join(window.coderoad.tutorialDir, fileToLoad));
+            }
+            else {
+                pathToFile = path.normalize(path.join(window.coderoad.dir, fileToLoad));
+            }
             lines[i] = fs.readFileSync(pathToFile, 'utf8');
         }
     }
diff --git a/src/reducers/run-tests/parse-loaders.ts b/src/reducers/run-tests/parse-loaders.ts
@@ -2,12 +2,12 @@ import * as path from 'path';
 import * as fs from 'fs';
 
 const supportedFileTypes = ['js', 'jsx', 'ts', 'py'];
-const js = /^\/\/\s?load\(['"`](.+)['"`]\)$/m; // // load('file'),
+const js = /^\/\/\s?load\(['"`](.+)['"`](\,\s?true)?\)/m; // // load('file'),
 const loaderMatch = {
   js,
   ts: js,
   jsx: js,
-  py: /^#\s?load\(['"`](.+)['"`]\)$/m      // # load('file')
+  py: /^#\s?load\(['"`](.+)['"`](,\s?true)?\)/m      // # load('file')
 };
 
 export default function parseLoaders(data: string, fileType: string) {
@@ -36,7 +36,15 @@ export default function parseLoaders(data: string, fileType: string) {
         continue;
       }
 
-      let pathToFile: string = path.normalize(path.join(window.coderoad.dir, fileToLoad));
+      let pathToFile: string = null;
+      if (loader[2]) {
+        // path to file from tutorial directory
+        pathToFile = path.normalize(path.join(window.coderoad.tutorialDir, fileToLoad));
+      } else {
+        // path to file from working directory
+        pathToFile = path.normalize(path.join(window.coderoad.dir, fileToLoad));
+      }
+
       lines[i] = fs.readFileSync(pathToFile, 'utf8');
     }
   }
