Repository: flex-utilities Updated Branches: refs/heads/develop add146d57 -> 606524fd4
FLEX-34398 FLEX-34408 Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/606524fd Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/606524fd Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/606524fd Branch: refs/heads/develop Commit: 606524fd4f9efe4523f5fecd51b1a60d30ecd6d1 Parents: add146d Author: Justin Mclean <jmcl...@apache.org> Authored: Sat Oct 11 06:59:12 2014 +1100 Committer: Justin Mclean <jmcl...@apache.org> Committed: Sat Oct 11 06:59:12 2014 +1100 ---------------------------------------------------------------------- installer/src/InstallApacheFlex.mxml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/606524fd/installer/src/InstallApacheFlex.mxml ---------------------------------------------------------------------- diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml index 4579477..8f8146d 100644 --- a/installer/src/InstallApacheFlex.mxml +++ b/installer/src/InstallApacheFlex.mxml @@ -1066,6 +1066,8 @@ variables are not required because the locations of these pieces are known. setXMLVariables(); // as AIR and Flash version may of changed + log("SDK version " + APACHE_FLEX_BIN_DISTRO_VERSION_DISPLAY); + if (flexVersion.selectedItem.needsAIR) { if (airVersionID) log("AIR version " + airVersionID); @@ -2304,6 +2306,7 @@ variables are not required because the locations of these pieces are known. } if (isAbort) { + log(abortInfo); tracker.trackInstallerFailure(APACHE_FLEX_BIN_DISTRO_VERSION_DISPLAY, APACHE_FLEX_BIN_DISTRO_VERSION, _os.os + "&info=" + abortInfo); } @@ -2814,6 +2817,17 @@ variables are not required because the locations of these pieces are known. } private function closeApplication(event:Event):void { + removeEventListener(Event.CLOSING, closeApplication); + + if (currentState == "installState") + { + if (currentStep < stepLabels.length) + { + // User aborted the installation by closing the installer + var activeStep:StepItem = getActiveStepItem(); + abortInstallation(_viewResourceConstants.INFO_USER_ABORT_INSTALLATION + activeStep.label); + } + } // TODO only enable close button when finished or when an error occurs // TODO anything we need to clean up? if (console && !console.closed) @@ -2822,6 +2836,15 @@ variables are not required because the locations of these pieces are known. close(); } + protected function getActiveStepItem():StepItem { + for each (var s:StepItem in _installationSteps) { + if (s.status == StepItem.ACTIVE) { + return s; + } + } + return null; + } + protected function clickLogo(event:MouseEvent):void { navigateToURL(new URLRequest(Constants.APACHE_FLEX_URL)); }
