pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

The settings enqueuing stuff for wizards was a stupid idea

Browse source 
Always save all settings from the client instead. Otherwise EVERY wizard needs its
own view model just to call that method...
This commit is contained in:
Gina Häußge 2015-08-20 10:26:43 +02:00
parent 3a6d577924
commit 9aa51d4f74
4 changed files with 1 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/octoprint/plugins/corewizard/static/js/corewizard.js
View file

@ -99,14 +99,6 @@ $(function() {
self.settingsViewModel = parameters[0];
self.onWizardFinish = function() {
self.settingsViewModel.enqueueForSaving({
webcam: {
streamUrl: self.settingsViewModel.webcam_streamUrl(),
snapshotUrl: self.settingsViewModel.webcam_snapshotUrl(),
ffmpegPath: self.settingsViewModel.webcam_ffmpegPath()
}
});
if (self.settingsViewModel.webcam_streamUrl()
|| (self.settingsViewModel.webcam_snapshotUrl() && self.settingsViewModel.webcam_ffmpegPath())) {
return "reload";

9
src/octoprint/plugins/cura/static/js/cura.js
View file

@ -264,15 +264,6 @@ $(function() {
};
self.onWizardFinish = function() {
self.settingsViewModel.enqueueForSaving({
plugins: {
cura: {
cura_engine: self.settings.plugins.cura.cura_engine(),
default_profile: self.settings.plugins.cura.default_profile(),
debug_logging: self.settings.plugins.cura.debug_logging()
}
}
});
self.resetPathTest();
};
}

29
src/octoprint/static/js/app/viewmodels/settings.js
View file

@ -12,8 +12,6 @@ $(function() {
self.sending = ko.observable(false);
self.callbacks = [];
self.enqueuedForSaving = undefined;
self.settingsDialog = undefined;
self.settings_dialog_update_detected = undefined;
self.translationManagerDialog = undefined;
@ -717,33 +715,6 @@ $(function() {
self.requestData();
}
};
self.enqueueForSaving = function(data) {
if (self.enqueuedForSaving == undefined) {
self.enqueuedForSaving = data;
} else {
_.extend(self.enqueuedForSaving, data);
}
};
self.saveEnqueued = function(callback) {
var data = self.getEnqueued();
self.resetEnqueued();
if (data == undefined) {
return;
}
self.saveData(data, callback);
};
self.getEnqueued = function() {
return self.enqueuedForSaving;
};
self.resetEnqueued = function() {
self.enqueuedForSaving = undefined;
};
}
OCTOPRINT_VIEWMODELS.push([

2
src/octoprint/static/js/app/viewmodels/wizard.js
View file

@ -153,7 +153,7 @@ $(function() {
self.finishWizard = function(callback) {
self.finishing = true;
self.settingsViewModel.saveEnqueued();
self.settingsViewModel.saveData();
$.ajax({
url: API_BASEURL + "setup/wizard",
type: "POST",