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

Couple of fixes while merging...

master
Gina Häußge 2013-02-23 22:46:29 +01:00
parent e828d4e7b7
commit 899d618efe
2 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,25 +220,37 @@ function TemperatureViewModel(settingsViewModel) {
self.temperature_profiles = settingsViewModel.temperature_profiles; self.temperature_profiles = settingsViewModel.temperature_profiles;
self.setTemp = function(profile) { self.setTempFromProfile = function(profile) {
$.ajax({ if (!profile)
url: AJAX_BASEURL + "control/temperature", return;
type: "POST", self.setTemp(profile.extruder);
dataType: "json", }
data: { temp: profile.extruder },
success: function() {$("#temp_newTemp").val("")} self.setTemp = function(temp) {
}) $.ajax({
}; url: AJAX_BASEURL + "control/temperature",
type: "POST",
self.setBedTemp = function(profile) { dataType: "json",
$.ajax({ data: { temp: temp },
url: AJAX_BASEURL + "control/temperature", success: function() {$("#temp_newTemp").val("")}
type: "POST", })
dataType: "json", };
data: { temp: profile.bed },
success: function() {$("#temp_newBedTemp").val("")} self.setBedTempFromProfile = function(profile) {
}) if (!profile)
}; return;
self.setBedTemp(profile.bed);
}
self.setBedTemp = function(bedTemp) {
$.ajax({
url: AJAX_BASEURL + "control/temperature",
type: "POST",
dataType: "json",
data: { bedTemp: bedTemp },
success: function() {$("#temp_newBedTemp").val("")}
})
};
self.tempString = ko.computed(function() { self.tempString = ko.computed(function() {
if (!self.temp()) if (!self.temp())
@ -1117,8 +1129,8 @@ function SettingsViewModel() {
"logs": self.folder_logs() "logs": self.folder_logs()
}, },
"temperature": { "temperature": {
"profiles": self.temperature_profiles(), "profiles": self.temperature_profiles()
}, }
} }
$.ajax({ $.ajax({

24
octoprint/templates/index.html
View File

@ -175,13 +175,15 @@
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li data-bind="foreach: temperature_profiles"> <!-- ko foreach: temperature_profiles -->
<a class="temp_newTemp_set" data-bind="click: $parent.setTemp, attr: {'data-temp' : extruder}, text: 'Set ' + name + ' (' + extruder + '&deg;C)'"></a> <li>
</li> <a href="#" data-bind="click: $parent.setTempFromProfile, text: 'Set ' + name + ' (' + extruder + '&deg;C)'"></a>
<li class="divider"></li> </li>
<li> <!-- /ko -->
<a class="temp_newTemp_set" data-temp="0">Off</a> <li class="divider"></li>
</li> <li>
<a href="#" data-bind="click: function() { $root.setTemp(0); }">Off</a>
</li>
</ul> </ul>
</div> </div>
</div> </div>
@ -203,12 +205,14 @@
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li data-bind="foreach: temperature_profiles"> <!-- ko foreach: temperature_profiles -->
<a class="temp_newBedTemp_set" data-bind="click: $parent.setBedTemp, attr: {'data-temp' : bed}, text: 'Set ' + name + ' (' + bed + '&deg;C)'"></a> <li>
<a href="#" data-bind="click: $parent.setBedTempFromProfile, text: 'Set ' + name + ' (' + bed + '&deg;C)'"></a>
</li> </li>
<!-- /ko -->
<li class="divider"></li> <li class="divider"></li>
<li> <li>
<a class="temp_newBedTemp_set" data-temp="0">Off</a> <a href="#" data-bind="click: function(){ $root.setBedTemp(0); }">Off</a>
</li> </li>
</ul> </ul>
</div> </div>