Gandalf/OctoPrint-Enclosure
1
0
Fork 0
Code Issues 156 Pull Requests 6 Actions Packages Projects Releases 28 Wiki Activity

Merge pull request #70 from randuhmm/bugfix/plugin-baseurl

Browse Source 
Adding fix for #69
This commit was merged in pull request #70.
This commit is contained in:
Vitor de Miranda Henrique
2017-12-09 19:35:24 -06:00
committed by GitHub
parent 7c3073ff63 366dc1fbbd
commit 0d672ce578
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
octoprint_enclosure/static/js/enclosure.js
View File

@@ -2,6 +2,8 @@ $(function() {
function EnclosureViewModel(parameters) {
var self = this;
self.pluginName = "enclosure";
self.global_settings = parameters[0];
self.connection = parameters[1];
self.printerStateViewModel = parameters[2];
@@ -152,7 +154,7 @@ $(function() {
self.setTemperature = function(){
if(self.isNumeric($("#enclosureSetTemp").val())){
$.ajax({
url: "/plugin/enclosure/setEnclosureTemperature",
url: self.buildPluginUrl("/setEnclosureTemperature"),
type: "GET",
dataType: "json",
data: {"enclosureSetTemp": Number($("#enclosureSetTemp").val())},
@@ -191,7 +193,7 @@ $(function() {
self.turnOffHeater = function(){
$.ajax({
url: "/plugin/enclosure/setEnclosureTemperature",
url: self.buildPluginUrl("/setEnclosureTemperature"),
type: "GET",
dataType: "json",
data: {"enclosureSetTemp":0},
@@ -204,7 +206,7 @@ $(function() {
self.clearGPIOMode = function(){
$.ajax({
url: "/plugin/enclosure/clearGPIOMode",
url: self.buildPluginUrl("/clearGPIOMode"),
type: "GET",
dataType: "json",
success: function(data) {
@@ -216,7 +218,7 @@ $(function() {
self.getUpdateBtnStatus = function(){
$.ajax({
url: "/plugin/enclosure/getUpdateBtnStatus",
url: self.buildPluginUrl("/getUpdateBtnStatus"),
type: "GET"
});
};
@@ -224,7 +226,7 @@ $(function() {
self.requestEnclosureTemperature = function(){
return $.ajax({
type: "GET",
url: "/plugin/enclosure/getEnclosureTemperature",
url: self.buildPluginUrl("/getEnclosureTemperature"),
async: false
}).responseText;
};
@@ -232,7 +234,7 @@ $(function() {
self.requestEnclosureSetTemperature = function(){
return $.ajax({
type: "GET",
url: "/plugin/enclosure/getEnclosureSetTemperature",
url: self.buildPluginUrl("/getEnclosureSetTemperature"),
async: false
}).responseText;
};
@@ -249,7 +251,7 @@ $(function() {
type: "GET",
dataType: "json",
data: {"io": data[0], "status": data[1]},
url: "/plugin/enclosure/setIO",
url: self.buildPluginUrl("/setIO"),
async: false
});
};
@@ -268,7 +270,7 @@ $(function() {
type: "GET",
dataType: "json",
data: {"io": io, "pwmVal": pwmVal},
url: "/plugin/enclosure/setPWM",
url: self.buildPluginUrl("/setPWM"),
});
}
};
@@ -290,7 +292,7 @@ $(function() {
type: "GET",
dataType: "json",
data: {"io": io, "red": r,"green": g,"blue": b},
url: "/plugin/enclosure/setNeopixel",
url: self.buildPluginUrl("/setNeopixel"),
});
}
};
@@ -366,6 +368,10 @@ $(function() {
self.isNumeric = function(n){
return !isNaN(parseFloat(n)) && isFinite(n);
};
self.buildPluginUrl = function(path) {
return window.PLUGIN_BASEURL + self.pluginName + path;
};
}
OCTOPRINT_VIEWMODELS.push([