flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject [06/50] [abbrv] git commit: [flex-utilities] [refs/heads/master] - Only show AIR and Flash Player versions that are supported for Linux
Date Sun, 04 Aug 2013 08:59:47 GMT
Only show AIR and Flash Player versions that are supported for Linux


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/c9e4220e
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/c9e4220e
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/c9e4220e

Branch: refs/heads/master
Commit: c9e4220e443975e130cf36f80c3a9a96978c166b
Parents: 31ea3c7
Author: Justin Mclean <jmclean@apache.org>
Authored: Mon May 27 11:09:10 2013 +1000
Committer: Justin Mclean <jmclean@apache.org>
Committed: Mon May 27 11:09:10 2013 +1000

----------------------------------------------------------------------
 installer/src/InstallApacheFlex.mxml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c9e4220e/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 6a54d9f..3bd9abd 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -423,20 +423,24 @@ variables are not required because the locations of these pieces are
known.
 			
 			var airVersions:Array = files.(@name == 'Versions').@airVersions.toString().split(",");
 			for each (var airVersion:String in airVersions) {
-				AIR_VERSIONS.addItem({label:"AIR " + airVersion, version:airVersion});
+				if (_os != LINUX_OS || Number(airVersion) <= 2.6) {
+					AIR_VERSIONS.addItem({label:"AIR " + airVersion, version:airVersion});
+				}
 			}
 			
 			if (this.airVersion.selectedIndex == -1) {
-				this.airVersion.selectedIndex = 1;	
+				this.airVersion.selectedIndex = 0;	
 			}
 			
 			var flashPlayerVersions:Array = files.(@name == 'Versions').@flashPlayerVersions.toString().split(",");
 			for each (var flashPlayerVersion:String in flashPlayerVersions) {
-				FLASH_PLAYER_VERSIONS.addItem({label:"Flash Player " + flashPlayerVersion, version:flashPlayerVersion});
+				if (_os != LINUX_OS || Number(flashPlayerVersion) <= 11.2) {
+					FLASH_PLAYER_VERSIONS.addItem({label:"Flash Player " + flashPlayerVersion, version:flashPlayerVersion});
+				}
 			}
 			
 			if (this.flashPlayerVersion.selectedIndex == -1) {
-				this.flashPlayerVersion.selectedIndex = 1;	
+				this.flashPlayerVersion.selectedIndex = 0;	
 			}
 
             ADOBE_AIR_SDK_WIN_FILE = files.(@name == 'AdobeAIRSDKWin' + AIR_VERSION).@file.toString();
@@ -528,9 +532,8 @@ variables are not required because the locations of these pieces are known.
             if (_mirrorURLUtil.errorOccurred) {
                 abortInstallation();
             } else {
-                if (APACHE_FLEX_BIN_DISTRO_PATH.substr(0, Constants.URL_PREFIX.length) !=
Constants.URL_PREFIX && APACHE_FLEX_BIN_DISTRO_PATH.substr(0,
-                                                                                        
                                                            Constants.FILE_PREFIX.length)
-                        != Constants.FILE_PREFIX) {
+                if (APACHE_FLEX_BIN_DISTRO_PATH.substr(0, Constants.URL_PREFIX.length) !=
Constants.URL_PREFIX
+					&& APACHE_FLEX_BIN_DISTRO_PATH.substr(0, Constants.FILE_PREFIX.length) != Constants.FILE_PREFIX)
{
                     APACHE_FLEX_BIN_DISTRO_URL = useMirrorPath(_mirrorURLUtil.mirrorURL)
+ APACHE_FLEX_BIN_DISTRO_PATH + APACHE_FLEX_BIN_DISTRO_FILE;
                 } else {
                     APACHE_FLEX_BIN_DISTRO_URL = APACHE_FLEX_BIN_DISTRO_PATH + APACHE_FLEX_BIN_DISTRO_FILE;


Mime
View raw message