incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r815201 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_new_mirrorbrain.js
Date Mon, 30 Apr 2012 23:14:46 GMT
Author: buildbot
Date: Mon Apr 30 23:14:45 2012
New Revision: 815201

Log:
Staging update by buildbot for openofficeorg

Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/download/test/download_new_mirrorbrain.js

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 30 23:14:45 2012
@@ -1 +1 @@
-1332460
+1332462

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Apr 30 23:14:45 2012
@@ -1 +1 @@
-1332460
+1332462

Modified: websites/staging/ooo-site/trunk/content/download/test/download_new_mirrorbrain.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download_new_mirrorbrain.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_new_mirrorbrain.js Mon
Apr 30 23:14:45 2012
@@ -359,7 +359,7 @@ function mirrorbrain_getFileName( versio
  */
 function mirrorbrain_getPlatformForMirror( schema ) {
 	var a = getArray();
-	if ( navigator.platform != null ) {
+	if ( navigator.platform != null && String(navigator.platform) != "") {
 		if ( schema == "old" ) {
 			if ( navigator.platform.indexOf( "Win32" ) != -1 ) {
 				return ( a[3] == 'y' ) ? "Win32Intel_install_wJRE" : "Win32Intel_install";
@@ -535,8 +535,12 @@ function mirrorbrain_getPlatformForMirro
 				return navigator.platform;
 			}
 		}
-	} // odd, no schema ?
-	return ( a[3] == 'y' ) ? "Win_x86_install-wJRE" : "Win_x86_install";
+	} //  null or empty navigator.platform fallback to win regardless of schema
+	if (schema != "aoo_incubating") {
+		return ( a[3] == 'y' ) ? "Win_x86_install-wJRE" : "Win_x86_install";
+	} else {
+		return "Win_x86_install";
+	}
 }
 
 /*



Mime
View raw message