Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C551CC394 for ; Sun, 29 Apr 2012 21:55:09 +0000 (UTC) Received: (qmail 40882 invoked by uid 500); 29 Apr 2012 21:55:09 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 40832 invoked by uid 500); 29 Apr 2012 21:55:09 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 40824 invoked by uid 99); 29 Apr 2012 21:55:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 Apr 2012 21:55:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 Apr 2012 21:55:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 473502388A3F for ; Sun, 29 Apr 2012 21:54:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r815049 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_new_dl.js Date: Sun, 29 Apr 2012 21:54:46 -0000 To: ooo-commits@incubator.apache.org From: buildbot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120429215446.473502388A3F@eris.apache.org> Author: buildbot Date: Sun Apr 29 21:54:45 2012 New Revision: 815049 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_dl.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Sun Apr 29 21:54:45 2012 @@ -1 +1 @@ -1332005 +1332006 Propchange: websites/staging/ooo-site/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Sun Apr 29 21:54:45 2012 @@ -1 +1 @@ -1332005 +1332006 Modified: websites/staging/ooo-site/trunk/content/download/test/download_new_dl.js ============================================================================== --- websites/staging/ooo-site/trunk/content/download/test/download_new_dl.js (original) +++ websites/staging/ooo-site/trunk/content/download/test/download_new_dl.js Sun Apr 29 21:54:45 2012 @@ -380,7 +380,11 @@ function hasMirrorLink() { if (schema == "aoo_inclubating") { platform = getPlatform(schema); } - + /* first check for availability */ + if ( platform == "none") { + return false; + } + if ( a[4] == 'y' ) { // special handling for MAC, links in combination with general flag a[4] if ( platform.indexOf( "Mac" ) == -1 || a[5] == 'y' ) { @@ -546,15 +550,15 @@ function getPlatform(schema) { } } } else if ( navigator.platform.indexOf( "SunOS i86pc" ) != -1 ) { - return ""; + return "none"; } else if ( navigator.platform.indexOf( "SunOS sun4u" ) != -1 ) { - return ""; + return "none"; } else if ( navigator.platform.indexOf( "SunOS" ) != -1 ) { - return ""; + return "none"; } else if ( navigator.platform.indexOf( "Mac" ) != -1 && navigator.platform.indexOf( "Intel" ) != -1 ) { return "Mac OS Intel"; } else if ( navigator.platform.indexOf( "Mac" ) != -1 && navigator.platform.indexOf( "PPC" ) != -1 ) { - return ""; + return "none"; } else if ( navigator.platform.indexOf( "Mac" ) != -1 ) { return "Mac OS Intel" ; } else if ( navigator.platform.indexOf( "iPad" ) != -1 || navigator.platform.indexOf( "iPhone" ) != -1 ||