Fix errors when not installed in root dir #149
Conversation
This file contains 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
Use relative paths instead of absolute paths so that if OctoPrint is not in the root of the domain (or is behind a proxy), the files can still be found and this plugin will work. Fixes Kragrathea#148
|
Funny, same as my submission #147 |
jotadrilo
reviewed
Nov 8, 2024
| @@ -16,7 +16,7 @@ $(function () { | |||
| durJobDate = job.file.date; | |||
| if(viewInitialized && gcodeProxy) | |||
| { | |||
| gcodeProxy.loadGcode('/downloads/files/local/' + curJobName); | |||
| gcodeProxy.loadGcode('downloads/files/local/' + curJobName); | |||
There was a problem hiding this comment.
OctoPrint defines the BASEURL global variable available to all plugins:
Suggested change
| gcodeProxy.loadGcode('downloads/files/local/' + curJobName); | |
| gcodeProxy.loadGcode(BASEURL + 'downloads/files/local/' + curJobName); |
There was a problem hiding this comment.
@jotadrilo is BASEURL determine dynamically for every browser visiting OctoPrint to ensure that the URL will always be correct for the present visitor, that way if I access it behind a proxy or directly it'll still work?
There was a problem hiding this comment.
In theory that's what my change should do, no need to add base url for actual relative links.
jotadrilo
reviewed
Nov 8, 2024
| @@ -569,7 +569,7 @@ $(function () { | |||
| this.orbitWhenIdle=false; | |||
| this.reloadGcode = function () { | |||
| if(gcodeProxy && curJobName!="") | |||
| gcodeProxy.loadGcode('/downloads/files/local/' + curJobName); | |||
| gcodeProxy.loadGcode('downloads/files/local/' + curJobName); | |||
There was a problem hiding this comment.
Suggested change
| gcodeProxy.loadGcode('downloads/files/local/' + curJobName); | |
| gcodeProxy.loadGcode(BASEURL + 'downloads/files/local/' + curJobName); |
jotadrilo
reviewed
Nov 8, 2024
| @@ -692,7 +692,7 @@ $(function () { | |||
|
|
|||
| //load Nozzle model. | |||
| var objloader = new THREE.OBJLoader(); | |||
| objloader.load( '/plugin/prettygcode/static/js/models/ExtruderNozzle.obj', function ( obj ) { | |||
| objloader.load( 'plugin/prettygcode/static/js/models/ExtruderNozzle.obj', function ( obj ) { | |||
There was a problem hiding this comment.
Suggested change
| objloader.load( 'plugin/prettygcode/static/js/models/ExtruderNozzle.obj', function ( obj ) { | |
| objloader.load( BASEURL + 'plugin/prettygcode/static/js/models/ExtruderNozzle.obj', function ( obj ) { |
jotadrilo
reviewed
Nov 8, 2024
| @@ -721,7 +721,7 @@ $(function () { | |||
| scene.add(gcodeObject); | |||
|
|
|||
| if(curJobName!="") | |||
| gcodeProxy.loadGcode('/downloads/files/local/' + curJobName); | |||
| gcodeProxy.loadGcode('downloads/files/local/' + curJobName); | |||
There was a problem hiding this comment.
Suggested change
| gcodeProxy.loadGcode('downloads/files/local/' + curJobName); | |
| gcodeProxy.loadGcode(BASEURL + 'downloads/files/local/' + curJobName); |
jotadrilo
reviewed
Nov 8, 2024
| @@ -1533,7 +1533,7 @@ $(function () { | |||
| } | |||
|
|
|||
| var fontLoader = new THREE.FontLoader(); | |||
| fontLoader.load('/plugin/prettygcode/static/js/helvetiker_bold.typeface.json', function (font) { | |||
| fontLoader.load('plugin/prettygcode/static/js/helvetiker_bold.typeface.json', function (font) { | |||
There was a problem hiding this comment.
Suggested change
| fontLoader.load('plugin/prettygcode/static/js/helvetiker_bold.typeface.json', function (font) { | |
| fontLoader.load(BASEURL + 'plugin/prettygcode/static/js/helvetiker_bold.typeface.json', function (font) { |
|
I have added the same comments in both PRs. I'd suggest closing one of them |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Use relative paths instead of absolute paths so that if OctoPrint is not in the root of the domain (or is behind a proxy), the files can still be found and this plugin will work.
Fixes #148