q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug in bootstrap forcing use of knockout click binding - actually works better

master
Richard Mitchell 2013-02-23 18:38:18 +00:00
parent aa2108e9c3
commit e79aede3f4
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
octoprint/static/js/ui.js
View File

@ -220,6 +220,26 @@ function TemperatureViewModel(settingsViewModel) {
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() {
if (!self.temp())
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();
if ($(this).data('temp') != null)
newTemp = $(this).data('temp');
$.ajax({
url: AJAX_BASEURL + "control/temperature",
type: "POST",
@ -1236,10 +1254,8 @@ $(function() {
success: function() {$("#temp_newTemp").val("")}
})
})
$("#temp_newBedTemp_set, .temp_newBedTemp_set").click(function() {
$("#temp_newBedTemp_set").click(function() {
var newBedTemp = $("#temp_newBedTemp").val();
if ($(this).data('temp') != null)
newBedTemp = $(this).data('temp');
$.ajax({
url: AJAX_BASEURL + "control/temperature",
type: "POST",

4
octoprint/templates/index.html
View File

@ -176,7 +176,7 @@
</button>
<ul class="dropdown-menu">
<li data-bind="foreach: temperature_profiles">
<a class="temp_newTemp_set" data-bind="attr: {'data-temp' : extruder}, text: 'Set ' + name + ' (' + extruder + '&deg;C)'"></a>
<a class="temp_newTemp_set" data-bind="click: $parent.setTemp, attr: {'data-temp' : extruder}, text: 'Set ' + name + ' (' + extruder + '&deg;C)'"></a>
</li>
<li class="divider"></li>
<li>
@ -204,7 +204,7 @@
</button>
<ul class="dropdown-menu">
<li data-bind="foreach: temperature_profiles">
<a class="temp_newBedTemp_set" data-bind="attr: {'data-temp' : bed}, text: 'Set ' + name + ' (' + bed + '&deg;C)'"></a>
<a class="temp_newBedTemp_set" data-bind="click: $parent.setBedTemp, attr: {'data-temp' : bed}, text: 'Set ' + name + ' (' + bed + '&deg;C)'"></a>
</li>
<li class="divider"></li>
<li>