From 5d321926bbda51f25f25f712dceee4118cb08fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 2 Jun 2017 16:06:11 +0200 Subject: [PATCH] Corewizard: Don't load js if not required --- src/octoprint/plugins/corewizard/__init__.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/octoprint/plugins/corewizard/__init__.py b/src/octoprint/plugins/corewizard/__init__.py index d9c61f67..e2b1851f 100644 --- a/src/octoprint/plugins/corewizard/__init__.py +++ b/src/octoprint/plugins/corewizard/__init__.py @@ -49,9 +49,12 @@ class CoreWizardPlugin(octoprint.plugin.AssetPlugin, #~~ AssetPlugin API def get_assets(self): - return dict( - js=["js/corewizard.js"] - ) + if self.is_wizard_required(): + return dict( + js=["js/corewizard.js"] + ) + else: + return dict() #~~ WizardPlugin API @@ -74,7 +77,7 @@ class CoreWizardPlugin(octoprint.plugin.AssetPlugin, return self._user_manager.enabled and not self._user_manager.hasBeenCustomized() def _get_acl_wizard_details(self): - return dict() + return dict(required=self._is_acl_wizard_required()) def _get_acl_wizard_name(self): return gettext("Access Control") @@ -119,7 +122,7 @@ class CoreWizardPlugin(octoprint.plugin.AssetPlugin, return not (webcam_snapshot_url and webcam_stream_url and ffmpeg_path) def _get_webcam_wizard_details(self): - return dict() + return dict(required=self._is_webcam_wizard_required()) def _get_webcam_wizard_name(self): return gettext("Webcam & Timelapse") @@ -134,7 +137,7 @@ class CoreWizardPlugin(octoprint.plugin.AssetPlugin, return not (system_shutdown_command and system_restart_command and server_restart_command) def _get_servercommands_wizard_details(self): - return dict() + return dict(required=self._is_servercommands_wizard_required()) def _get_servercommands_wizard_name(self): return gettext("Server Commands") @@ -145,7 +148,7 @@ class CoreWizardPlugin(octoprint.plugin.AssetPlugin, return self._printer_profile_manager.is_default_unmodified() and self._printer_profile_manager.profile_count == 1 def _get_printerprofile_wizard_details(self): - return dict() + return dict(required=self._is_printerprofile_wizard_required()) def _get_printerprofile_wizard_name(self): return gettext("Default Printer Profile")