You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ma...@apache.org on 2014/03/11 00:12:34 UTC

svn commit: r1576125 - /openoffice/ooo-site/trunk/content/download/test/download.js

Author: marcus
Date: Mon Mar 10 23:12:33 2014
New Revision: 1576125

URL: http://svn.apache.org/r1576125
Log:
Recognize Mac OS X 10.6 and older not as old platform in case of stable release with AOO 4.0.1

Modified:
    openoffice/ooo-site/trunk/content/download/test/download.js

Modified: openoffice/ooo-site/trunk/content/download/test/download.js
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download.js?rev=1576125&r1=1576124&r2=1576125&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/download.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/download.js Mon Mar 10 23:12:33 2014
@@ -125,7 +125,7 @@ function getLink( rel_mode ) {
 	var chk_link = "";
 
 	getLanguage();
-	getPlatform();
+	getPlatform( rel_mode );
 	if ( hasMirrorLink() ) {
 		getFilesize( rel_mode );
 	}
@@ -146,6 +146,7 @@ function getLink( rel_mode ) {
 			// If platform is too old, then provide a general download link to the archive.
 			if ( OLD_PLATFORM ) {
 				// If platform is Mac OS X <=10.6, then provide a download link with previous AOO version.
+/*
 				if ( UI_PLATFORM == "Mac OS X (10.6 or older)" ) {
 
 					FILENAME	= "Apache_OpenOffice_" + PRE_VERSION + "_" + URL_PLATFORM + "_";
@@ -167,6 +168,7 @@ function getLink( rel_mode ) {
 					ERROR		= true;
 					return LINK;
 				}
+*/
 				// If platform is Solaris, FreeBSD or OS/2,
 				// then provide a download link to the porting webpage.
 				if ( UI_PLATFORM == "Solaris x86 (PKG)"   ||
@@ -182,6 +184,7 @@ function getLink( rel_mode ) {
 					ERROR		= true;
 					return LINK;
 				}
+
 				LINK		= "http://archive.apache.org/dist/openoffice/";
 
 				CHECKSUM_KEYS	= "https://people.apache.org/keys/group/openoffice.asc";
@@ -320,7 +323,7 @@ function getLink( rel_mode ) {
  * Get platform of browser
  * Depends on internal browser data
  */
-function getPlatform() {
+function getPlatform( rel_mode ) {
 	// For more help or data see: "http://www.useragentstring.com"
 
 	var os = navigator.platform.toLowerCase();
@@ -463,7 +466,8 @@ function getPlatform() {
 		     ua.indexOf( "10_4"		) != -1 ||
 		     ua.indexOf( "10.3"		) != -1 ||
 		     ua.indexOf( "10_3"		) != -1 ) {	UI_PLATFORM	= "Mac OS X (10.6 or older)";
-								OLD_PLATFORM	= true;
+								if ( rel_mode > 0 )
+									OLD_PLATFORM = true;
 		}
 	  } 
 	}