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/05/20 23:35:14 UTC
svn commit: r1596421 -
/openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Tue May 20 21:35:14 2014
New Revision: 1596421
URL: http://svn.apache.org/r1596421
Log:
Updated comments and variables
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1596421&r1=1596420&r2=1596421&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue May 20 21:35:14 2014
@@ -11,6 +11,9 @@
* function getOSSel ()
* function getLangSel ()
* function getVerSel ()
+ * function setOSSel ()
+ * function setLangSel ()
+ * function setVerSel ()
* function resetSel ()
* function showPopup ( target_url )
* function isLangSupported ()
@@ -26,12 +29,10 @@
* Init function
*/
function init() {
- // Fill the OS, language and version drop-down box.
-
// Set global variables.
initVars();
- // Set the select elements with values (defined browser data).
+ // Fill the OS, language and version select boxes.
fillOSSel()
fillLangSel();
fillVerSel();
@@ -150,6 +151,7 @@ function getLanguage() {
// If available, use the manual set ISO code (see "index.html") that overrides $LANG_ISO.
if( NL_LANG != "" )
language = NL_LANG;
+
// If available, use the selected language form drop-down-box.
if( LANG_SEL != "" )
language = LANG_SEL;
@@ -251,6 +253,7 @@ function fillOSSel() {
// Get the platform from the browser data.
getPlatform();
+
// Set the recognized platform as default.
setOSSel();
@@ -278,6 +281,7 @@ function fillLangSel() {
// Get the language from the browser data.
getLanguage();
+
// Set the recognized language as default.
setLangSel();
/*
@@ -956,16 +960,21 @@ function getLink( rel_mode ) {
if( OLD_PLATFORM ) {
// If platform is 'Mac OS X <= 10.6', provide a download link with previous AOO version.
if( UI_PLATFORM == "Mac OS X (10.6 or older)" ) {
- LINK_FULL = SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/";
- LINK_FULL = LINK_FULL + getFilename( PRE_VERSION ) + "/download";
+ LINK_FULL = SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/";
+ LINK_FULL = LINK_FULL + getFilename( PRE_VERSION );
+ LINK_FULL = LINK_FULL + "/download"
LINK_CHECKSUM_KEYS = "https://people.apache.org/keys/group/openoffice.asc";
- LINK_CHECKSUM_ASC_FULL = APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
- LINK_CHECKSUM_ASC_FULL = LINK_CHECKSUM_ASC_FULL + getFilename( PRE_VERSION ) + ".asc";
- LINK_CHECKSUM_MD5_FULL = APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
- LINK_CHECKSUM_MD5_FULL = LINK_CHECKSUM_MD5_FULL + getFilename( PRE_VERSION ) + ".md5";
- LINK_CHECKSUM_SHA256_FULL = APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
- LINK_CHECKSUM_SHA256_FULL = LINK_CHECKSUM_SHA256_FULL + getFilename( PRE_VERSION ) + ".sha256";
+
+ LINK_CHECKSUM_ASC_FULL = APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
+ LINK_CHECKSUM_ASC_FULL = LINK_CHECKSUM_ASC_FULL + getFilename( PRE_VERSION ) + ".asc";
+
+ LINK_CHECKSUM_MD5_FULL = APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
+ LINK_CHECKSUM_MD5_FULL = LINK_CHECKSUM_MD5_FULL + getFilename( PRE_VERSION ) + ".md5";
+
+ LINK_CHECKSUM_SHA256_FULL = APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/";
+ LINK_CHECKSUM_SHA256_FULL = LINK_CHECKSUM_SHA256_FULL + getFilename( PRE_VERSION );
+ LINK_CHECKSUM_SHA256_FULL = LINK_CHECKSUM_SHA256_FULL + ".sha256"
SOURCEFORGE = false;
OTHER = false;
@@ -1025,10 +1034,13 @@ function getLink( rel_mode ) {
LINK_FULL = SOURCEFORGE_BASE_URL + LANG_ISO + "/" + getFilename( VERSION ) + "/download";
LINK_CHECKSUM_KEYS = "https://people.apache.org/keys/group/openoffice.asc";
+
LINK_CHECKSUM_ASC_FULL = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + getFilename( VERSION );
LINK_CHECKSUM_ASC_FULL = LINK_CHECKSUM_ASC_FULL + ".asc";
+
LINK_CHECKSUM_MD5_FULL = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + getFilename( VERSION );
LINK_CHECKSUM_MD5_FULL = LINK_CHECKSUM_MD5_FULL + ".md5";
+
LINK_CHECKSUM_SHA256_FULL = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + getFilename( VERSION );
LINK_CHECKSUM_SHA256_FULL = LINK_CHECKSUM_SHA256_FULL + ".sha256";
@@ -1099,9 +1111,8 @@ function getLinkSel( rel_mode ) {
// if( URL_PLATFORM != "" && LANG_ISO != "" ) {
// if( URL_PLATFORM != "" && LANG_ISO != "" && VERSION_SEL != "" ) {
if( PLATFORM_SEL != "" && LANG_SEL != "" && VERSION_SEL != "" ) {
-
+ // If language and platform are recognized, assemble the filenames for download and checksums.
if( LANG_SEL != "" && RELEASE_MATRIX_PLATFORM_POS_FULL > -1 ) {
- // If language and platform are recognized, assemble the filenames for download and checksums.
// Assign the file name (column 3) from the release matrix of language and platform.
LINK_FULL = SOURCEFORGE_BASE_URL + LANG_SEL + "/" + FILENAME_FULL + "/download";
@@ -1325,6 +1336,7 @@ function getPlatform() {
EXTENSION = ".tar.gz";
}
}
+
// 64-bit, DEB or RPM?
if( os.indexOf( "_64" ) != -1 ||
os.indexOf( "-64" ) != -1 ||
@@ -1380,10 +1392,12 @@ function getPlatform() {
function getFilename( ver ) {
// Assemble the filename for download from the release matrix of language and platform (column 0).
// Product name + version + platform as URL part + language ISO + file extension.
- FILENAME_FULL = "Apache_OpenOffice_" + ver + "_" + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ];
- FILENAME_FULL = FILENAME_FULL + "_" + LANG_ISO + EXTENSION;
- FILENAME_LP = "Apache_OpenOffice_" + ver + "_" + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ];
- FILENAME_LP = FILENAME_LP + "_" + LANG_ISO + EXTENSION;
+ FILENAME_FULL = "Apache_OpenOffice_" + ver + "_";
+ FILENAME_FULL = FILENAME_FULL + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ];
+ FILENAME_FULL = FILENAME_FULL + "_" + LANG_ISO + EXTENSION;
+ FILENAME_LP = "Apache_OpenOffice_" + ver + "_"
+ FILENAME_LP = FILENAME_LP + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ];
+ FILENAME_LP = FILENAME_LP + "_" + LANG_ISO + EXTENSION;
return FILENAME_FULL;
}
@@ -1439,6 +1453,7 @@ function getFilesize() {
if( RELEASE_MATRIX_PLATFORM_POS_FULL > -1 && !ERROR ) {
// Assign all values from the release matrix of language and platform.
RELEASE_MATRIX_PLATFORM = release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ];
+
// Assign the file size (column 2) from the release matrix of language and platform.
FILESIZE_FULL = release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 2 ];
FILESIZE_LP = release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 2 ];