From a7f9deff2b2c58542dd1f2d94a6ed6d85da2af7d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 27 Nov 2019 21:07:54 +0100 Subject: [PATCH] Add hooks to track package installation process --- wcfsetup/install/files/acp/js/WCF.ACP.js | 2 ++ wcfsetup/setup/template/stepConfigureDB.tpl | 4 +++- wcfsetup/setup/template/stepConfigureDirectories.tpl | 4 +++- wcfsetup/setup/template/stepCreateUser.tpl | 4 +++- wcfsetup/setup/template/stepInstallPackages.tpl | 4 +++- wcfsetup/setup/template/stepNext.tpl | 4 +++- wcfsetup/setup/template/stepSelectLanguages.tpl | 4 +++- wcfsetup/setup/template/stepSelectSetupLanguage.tpl | 4 +++- wcfsetup/setup/template/stepShowLicense.tpl | 4 +++- wcfsetup/setup/template/stepShowSystemRequirements.tpl | 3 +++ 10 files changed, 29 insertions(+), 8 deletions(-) diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js index 97ab59f6cc..a60e52da7c 100644 --- a/wcfsetup/install/files/acp/js/WCF.ACP.js +++ b/wcfsetup/install/files/acp/js/WCF.ACP.js @@ -336,6 +336,8 @@ WCF.ACP.Package.Installation = Class.extend({ _success: function(data, textStatus, jqXHR) { this._shouldRender = false; + if (typeof window._trackPackageStep === 'function') window._trackPackageStep(this._actionName, data); + if (this._dialog === null) { this._dialog = $('
').hide().appendTo(document.body); this._dialog.wcfDialog({ diff --git a/wcfsetup/setup/template/stepConfigureDB.tpl b/wcfsetup/setup/template/stepConfigureDB.tpl index 6f2c1f71a9..d7a3105988 100644 --- a/wcfsetup/setup/template/stepConfigureDB.tpl +++ b/wcfsetup/setup/template/stepConfigureDB.tpl @@ -62,5 +62,7 @@ {/foreach}
- + {include file='footer'} diff --git a/wcfsetup/setup/template/stepConfigureDirectories.tpl b/wcfsetup/setup/template/stepConfigureDirectories.tpl index d3c6bc09b6..80c33d7c7e 100644 --- a/wcfsetup/setup/template/stepConfigureDirectories.tpl +++ b/wcfsetup/setup/template/stepConfigureDirectories.tpl @@ -76,5 +76,7 @@ } })(); - + {include file='footer'} diff --git a/wcfsetup/setup/template/stepCreateUser.tpl b/wcfsetup/setup/template/stepCreateUser.tpl index 2ca59286ea..eeccd62153 100644 --- a/wcfsetup/setup/template/stepCreateUser.tpl +++ b/wcfsetup/setup/template/stepCreateUser.tpl @@ -86,5 +86,7 @@ {/foreach} - + {include file='footer'} diff --git a/wcfsetup/setup/template/stepInstallPackages.tpl b/wcfsetup/setup/template/stepInstallPackages.tpl index 783345a158..43c31d8a61 100644 --- a/wcfsetup/setup/template/stepInstallPackages.tpl +++ b/wcfsetup/setup/template/stepInstallPackages.tpl @@ -14,7 +14,9 @@ - + {include file='footer'} diff --git a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl index 3293608a73..8ed44835fa 100644 --- a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl +++ b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl @@ -27,5 +27,7 @@ - + {include file='footer'} diff --git a/wcfsetup/setup/template/stepShowLicense.tpl b/wcfsetup/setup/template/stepShowLicense.tpl index b542284a43..2ca99824ca 100644 --- a/wcfsetup/setup/template/stepShowLicense.tpl +++ b/wcfsetup/setup/template/stepShowLicense.tpl @@ -30,5 +30,7 @@ - + {include file='footer'} diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl index 8514040101..6a6f44ff77 100644 --- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl +++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl @@ -157,4 +157,7 @@ + {include file='footer'} -- 2.20.1