run spark platform mjs before source#2004
Open
madanagopaltcomcast wants to merge 6 commits intopxscene:_webglfrom
madanagopaltcomcast:load_mjs
Open
run spark platform mjs before source#2004madanagopaltcomcast wants to merge 6 commits intopxscene:_webglfrom madanagopaltcomcast:load_mjs
madanagopaltcomcast wants to merge 6 commits intopxscene:_webglfrom
madanagopaltcomcast:load_mjs
Conversation
Codecov Report
@@ Coverage Diff @@
## _webgl #2004 +/- ##
==========================================
- Coverage 76.79% 75.33% -1.47%
==========================================
Files 141 143 +2
Lines 21076 21617 +541
==========================================
+ Hits 16186 16285 +99
- Misses 4890 5332 +442
Continue to review full report at Codecov.
|
examples/pxScene2d/src/initGL.js
Outdated
| // define platform | ||
| var platformsource = ""; | ||
| if (filename.indexOf(".mjs") != -1) { | ||
| let platformfile = await getFile(filename.substring(0, filename.lastIndexOf("/")+1) + "lib/lightning-spark.js"); |
Contributor
There was a problem hiding this comment.
can you use path.dirname, url.resolve please?
Contributor
Author
There was a problem hiding this comment.
addressed, please review the same
| var platformsource = ""; | ||
| if (filename.indexOf(".mjs") != -1) { | ||
| let platformfile = await getFile(filename.substring(0, filename.lastIndexOf("/")+1) + "lib/lightning-spark.js"); | ||
| let platformfile = await getFile(urlmain.resolve(path.dirname(filename) + "/", "lib/lightning-spark.js")); |
Contributor
There was a problem hiding this comment.
just let platformfile = await getFile(urlmain.resolve(filename, "lib/lightning-spark.js")); is enough, however your code works too
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.