Commitb7cfa59

committed

load from tutorial directory when using param true

1 parent3e3d29a commitb7cfa59Copy full SHA for b7cfa59

File tree

+20

-6

lines changed

+20

-6

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@`
`2`	`2`	`varpath=require('path');`
`3`	`3`	`varfs=require('fs');`
`4`	`4`	`varsupportedFileTypes=['js','jsx','ts','py'];`
`5`		-varjs=/^\/\/\s?load$['"`](.+)['"`]$$/m;
	`5`	+varjs=/^\/\/\s?load$['"`](.+)['"`](\,\s?true)?$/m;
`6`	`6`	`varloaderMatch={`
`7`	`7`	`js:js,`
`8`	`8`	`ts:js,`
`9`	`9`	`jsx:js,`
`10`		-py:/^#\s?load$['"`](.+)['"`]$$/m
	`10`	+py:/^#\s?load$['"`](.+)['"`](,\s?true)?$/m
`11`	`11`	`};`
`12`	`12`	`functionparseLoaders(data,fileType){`
`13`	`13`	`if(supportedFileTypes.indexOf(fileType)<0){`
`@@ -26,7 +26,13 @@ function parseLoaders(data, fileType) {`
`26`	`26`	`console.log("\""+fileToLoad+"\" already loaded.");`
`27`	`27`	`continue;`
`28`	`28`	`}`
`29`		`-varpathToFile=path.normalize(path.join(window.coderoad.dir,fileToLoad));`
	`29`	`+varpathToFile=null;`
	`30`	`+if(loader[2]){`
	`31`	`+pathToFile=path.normalize(path.join(window.coderoad.tutorialDir,fileToLoad));`
	`32`	`+}`
	`33`	`+else{`
	`34`	`+pathToFile=path.normalize(path.join(window.coderoad.dir,fileToLoad));`
	`35`	`+}`
`30`	`36`	`lines[i]=fs.readFileSync(pathToFile,'utf8');`
`31`	`37`	`}`
`32`	`38`	`}`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@ import * as path from 'path';`
`2`	`2`	`import*asfsfrom'fs';`
`3`	`3`
`4`	`4`	`constsupportedFileTypes=['js','jsx','ts','py'];`
`5`		-constjs=/^\/\/\s?load$['"`](.+)['"`]$$/m;// // load('file'),
	`5`	+constjs=/^\/\/\s?load$['"`](.+)['"`](\,\s?true)?$/m;// // load('file'),
`6`	`6`	`constloaderMatch={`
`7`	`7`	`js,`
`8`	`8`	`ts:js,`
`9`	`9`	`jsx:js,`
`10`		-py:/^#\s?load$['"`](.+)['"`]$$/m// # load('file')
	`10`	+py:/^#\s?load$['"`](.+)['"`](,\s?true)?$/m// # load('file')
`11`	`11`	`};`
`12`	`12`
`13`	`13`	`exportdefaultfunctionparseLoaders(data:string,fileType:string){`
`@@ -36,7 +36,15 @@ export default function parseLoaders(data: string, fileType: string) {`
`36`	`36`	`continue;`
`37`	`37`	`}`
`38`	`38`
`39`		`-letpathToFile:string=path.normalize(path.join(window.coderoad.dir,fileToLoad));`
	`39`	`+letpathToFile:string=null;`
	`40`	`+if(loader[2]){`
	`41`	`+// path to file from tutorial directory`
	`42`	`+pathToFile=path.normalize(path.join(window.coderoad.tutorialDir,fileToLoad));`
	`43`	`+}else{`
	`44`	`+// path to file from working directory`
	`45`	`+pathToFile=path.normalize(path.join(window.coderoad.dir,fileToLoad));`
	`46`	`+}`
	`47`	`+`
`40`	`48`	`lines[i]=fs.readFileSync(pathToFile,'utf8');`
`41`	`49`	`}`
`42`	`50`	`}`

Comments

(0)