You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/10/11 03:37:11 UTC
git commit: [flex-utilities] [refs/heads/develop] - no need to log
error twice + stop RTE when no internet connection
Repository: flex-utilities
Updated Branches:
refs/heads/develop 543bdd06e -> ffccc7ece
no need to log error twice + stop RTE when no internet connection
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/ffccc7ec
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/ffccc7ec
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/ffccc7ec
Branch: refs/heads/develop
Commit: ffccc7ece67017ce31352159261051d5b0de157b
Parents: 543bdd0
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Oct 11 12:36:37 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Oct 11 12:36:37 2014 +1100
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/ffccc7ec/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index bbb9220..b849ae4 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -2353,7 +2353,6 @@ 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);
}
@@ -2404,9 +2403,11 @@ variables are not required because the locations of these pieces are known.
browseBtn.enabled = false;
installBtn.enabled = false;
wasAborted = true;
- log(_viewResourceConstants.INFO_ABORT_INSTALLATION);
+ if (_viewResourceConstants)
+ log(_viewResourceConstants.INFO_ABORT_INSTALLATION);
cleanup(true, reason);
- firstStepGroup.title = secondStepGroup.title = thirdStepGroup.title = _viewResourceConstants.INFO_ABORT_INSTALLATION;
+ if (_viewResourceConstants)
+ firstStepGroup.title = secondStepGroup.title = thirdStepGroup.title = _viewResourceConstants.INFO_ABORT_INSTALLATION;
}
protected function _langSelect_changeHandler(event:IndexChangeEvent):void {
@@ -2872,7 +2873,8 @@ variables are not required because the locations of these pieces are known.
{
// User aborted the installation by closing the installer
var activeStep:StepItem = getActiveStepItem();
- abortInstallation(_viewResourceConstants.INFO_USER_ABORT_INSTALLATION + activeStep.label);
+ if (_viewResourceConstants)
+ abortInstallation(_viewResourceConstants.INFO_USER_ABORT_INSTALLATION + activeStep.label);
}
}
// TODO only enable close button when finished or when an error occurs