Bug in bootstrap forcing use of knockout click binding - actually works better
parent
aa2108e9c3
commit
e79aede3f4
|
@ -220,6 +220,26 @@ function TemperatureViewModel(settingsViewModel) {
|
||||||
|
|
||||||
self.temperature_profiles = settingsViewModel.temperature_profiles;
|
self.temperature_profiles = settingsViewModel.temperature_profiles;
|
||||||
|
|
||||||
|
self.setTemp = function(profile) {
|
||||||
|
$.ajax({
|
||||||
|
url: AJAX_BASEURL + "control/temperature",
|
||||||
|
type: "POST",
|
||||||
|
dataType: "json",
|
||||||
|
data: { temp: profile.extruder },
|
||||||
|
success: function() {$("#temp_newTemp").val("")}
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
self.setBedTemp = function(profile) {
|
||||||
|
$.ajax({
|
||||||
|
url: AJAX_BASEURL + "control/temperature",
|
||||||
|
type: "POST",
|
||||||
|
dataType: "json",
|
||||||
|
data: { temp: profile.bed },
|
||||||
|
success: function() {$("#temp_newBedTemp").val("")}
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
self.tempString = ko.computed(function() {
|
self.tempString = ko.computed(function() {
|
||||||
if (!self.temp())
|
if (!self.temp())
|
||||||
return "-";
|
return "-";
|
||||||
|
@ -1222,12 +1242,10 @@ $(function() {
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
//~~ Temperature control
|
//~~ Temperature control (should really move to knockout click binding)
|
||||||
|
|
||||||
$("#temp_newTemp_set, .temp_newTemp_set").click(function() {
|
$("#temp_newTemp_set").click(function() {
|
||||||
var newTemp = $("#temp_newTemp").val();
|
var newTemp = $("#temp_newTemp").val();
|
||||||
if ($(this).data('temp') != null)
|
|
||||||
newTemp = $(this).data('temp');
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: AJAX_BASEURL + "control/temperature",
|
url: AJAX_BASEURL + "control/temperature",
|
||||||
type: "POST",
|
type: "POST",
|
||||||
|
@ -1236,10 +1254,8 @@ $(function() {
|
||||||
success: function() {$("#temp_newTemp").val("")}
|
success: function() {$("#temp_newTemp").val("")}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
$("#temp_newBedTemp_set, .temp_newBedTemp_set").click(function() {
|
$("#temp_newBedTemp_set").click(function() {
|
||||||
var newBedTemp = $("#temp_newBedTemp").val();
|
var newBedTemp = $("#temp_newBedTemp").val();
|
||||||
if ($(this).data('temp') != null)
|
|
||||||
newBedTemp = $(this).data('temp');
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: AJAX_BASEURL + "control/temperature",
|
url: AJAX_BASEURL + "control/temperature",
|
||||||
type: "POST",
|
type: "POST",
|
||||||
|
|
|
@ -176,7 +176,7 @@
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
<li data-bind="foreach: temperature_profiles">
|
<li data-bind="foreach: temperature_profiles">
|
||||||
<a class="temp_newTemp_set" data-bind="attr: {'data-temp' : extruder}, text: 'Set ' + name + ' (' + extruder + '°C)'"></a>
|
<a class="temp_newTemp_set" data-bind="click: $parent.setTemp, attr: {'data-temp' : extruder}, text: 'Set ' + name + ' (' + extruder + '°C)'"></a>
|
||||||
</li>
|
</li>
|
||||||
<li class="divider"></li>
|
<li class="divider"></li>
|
||||||
<li>
|
<li>
|
||||||
|
@ -204,7 +204,7 @@
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
<li data-bind="foreach: temperature_profiles">
|
<li data-bind="foreach: temperature_profiles">
|
||||||
<a class="temp_newBedTemp_set" data-bind="attr: {'data-temp' : bed}, text: 'Set ' + name + ' (' + bed + '°C)'"></a>
|
<a class="temp_newBedTemp_set" data-bind="click: $parent.setBedTemp, attr: {'data-temp' : bed}, text: 'Set ' + name + ' (' + bed + '°C)'"></a>
|
||||||
</li>
|
</li>
|
||||||
<li class="divider"></li>
|
<li class="divider"></li>
|
||||||
<li>
|
<li>
|
||||||
|
|
Loading…
Reference in New Issue