diff --git a/src/octoprint/plugins/corewizard/static/js/corewizard.js b/src/octoprint/plugins/corewizard/static/js/corewizard.js index b40b8573..f909057e 100644 --- a/src/octoprint/plugins/corewizard/static/js/corewizard.js +++ b/src/octoprint/plugins/corewizard/static/js/corewizard.js @@ -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"; diff --git a/src/octoprint/plugins/cura/static/js/cura.js b/src/octoprint/plugins/cura/static/js/cura.js index f849fb75..fb551689 100644 --- a/src/octoprint/plugins/cura/static/js/cura.js +++ b/src/octoprint/plugins/cura/static/js/cura.js @@ -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(); }; } diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js index 373a5943..25be4dc1 100644 --- a/src/octoprint/static/js/app/viewmodels/settings.js +++ b/src/octoprint/static/js/app/viewmodels/settings.js @@ -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([ diff --git a/src/octoprint/static/js/app/viewmodels/wizard.js b/src/octoprint/static/js/app/viewmodels/wizard.js index 34081788..3c41b082 100644 --- a/src/octoprint/static/js/app/viewmodels/wizard.js +++ b/src/octoprint/static/js/app/viewmodels/wizard.js @@ -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",