Author: marcus Date: Sun May 18 19:23:18 2014 New Revision: 1595661 URL: http://svn.apache.org/r1595661 Log: Re-ordered list of recognized and not recognized user agents
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=1595661&r1=1595660&r2=1595661&view=diff ============================================================================== --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Sun May 18 19:23:18 2014 @@ -1193,66 +1193,66 @@ function getPlatform() { if ( os ) { // Recognized but not supported platforms/OS, set $UI_PLATFORM to show it to the user. - if ( os.indexOf( "os/2" ) != -1 ) UI_PLATFORM = "OS/2"; - if ( os.indexOf( "freebsd" ) != -1 ) UI_PLATFORM = "FreeBSD (PKG)"; - if ( os.indexOf( "openbsd" ) != -1 ) UI_PLATFORM = "OpenBSD"; - if ( os.indexOf( "netbsd" ) != -1 ) UI_PLATFORM = "NetBSD"; - if ( os.indexOf( "pcbsd" ) != -1 ) UI_PLATFORM = "PC-BSD"; - if ( os.indexOf( "dragonfly" ) != -1 ) UI_PLATFORM = "DragonFly BSD"; - if ( os.indexOf( "amiga" ) != -1 ) UI_PLATFORM = "AmigaOS"; - if ( os.indexOf( "darwin" ) != -1 ) UI_PLATFORM = "Darwin"; if ( os.indexOf( "aix" ) != -1 ) UI_PLATFORM = "IBM AIX"; - if ( os.indexOf( "irix" ) != -1 ) UI_PLATFORM = "IRIX"; - if ( os.indexOf( "vms" ) != -1 ) UI_PLATFORM = "OpenVMS"; if ( os.indexOf( "alphaserver" ) != -1 ) UI_PLATFORM = "AlphaServer"; - if ( os.indexOf( "qnx" ) != -1 ) UI_PLATFORM = "QNX"; - if ( os.indexOf( "x11" ) != -1 ) UI_PLATFORM = "unknown OS (X11 support)"; + if ( os.indexOf( "amiga" ) != -1 ) UI_PLATFORM = "AmigaOS"; + if ( ua.indexOf( "android" ) != -1 || + av.indexOf( "android" ) != -1 ) UI_PLATFORM = "Android mobile devices"; if ( os.indexOf( "arm" ) != -1 ) UI_PLATFORM = "ARM mobile devices"; - if ( os.indexOf( "sunos" ) != -1 ) { UI_PLATFORM = "Solaris x86 (PKG)"; + if ( ua.indexOf( "blackberry" ) != -1 ) UI_PLATFORM = "Blackberry smartphones"; + if ( ua.indexOf( "brew" ) != -1 ) UI_PLATFORM = "smartphones (BREW)"; + if ( ua.indexOf( "ce.net" ) != -1 ) UI_PLATFORM = "mobile phones (Windows CE)"; + if ( os.indexOf( "darwin" ) != -1 ) UI_PLATFORM = "Darwin"; + if ( os.indexOf( "dragonfly" ) != -1 ) UI_PLATFORM = "DragonFly BSD"; + if ( os.indexOf( "freebsd" ) != -1 ) UI_PLATFORM = "FreeBSD (PKG)"; + if ( ua.indexOf( "hiptop" ) != -1 ) UI_PLATFORM = "smartphones (Hiptop)"; + if ( ua.indexOf( "ipad" ) != -1 || + ua.indexOf( "iphone" ) != -1 || + ua.indexOf( "ipod" ) != -1 ) UI_PLATFORM = "Apple iPhone/iPad/iPod"; + if ( os.indexOf( "irix" ) != -1 ) UI_PLATFORM = "IRIX"; + if ( ua.indexOf( "kindle" ) != -1 ) UI_PLATFORM = "Kindle mobile devices"; + if ( os.indexOf( "netbsd" ) != -1 ) UI_PLATFORM = "NetBSD"; + if ( ua.indexOf( "nintendo" ) != -1 ) UI_PLATFORM = "Nintendo game console"; + if ( ua.indexOf( "nokia" ) != -1 ) UI_PLATFORM = "Nokia mobile devices"; + if ( os.indexOf( "openbsd" ) != -1 ) UI_PLATFORM = "OpenBSD"; + if ( os.indexOf( "os/2" ) != -1 ) UI_PLATFORM = "OS/2"; + if ( ua.indexOf( "palm" ) != -1 ) UI_PLATFORM = "mobile phones (Palm OS)"; + if ( os.indexOf( "pcbsd" ) != -1 ) UI_PLATFORM = "PC-BSD"; + if ( ua.indexOf( "pike" ) != -1 ) UI_PLATFORM = "mobile phones (Pike)"; + if ( ua.indexOf( "playstation" ) != -1 ) UI_PLATFORM = "Sony Playstation"; + if ( ua.indexOf( "power_pc" ) != -1 || + ua.indexOf( "ppc" ) != -1 ) { UI_PLATFORM = "Mac OS PPC (DMG)"; OLD_PLATFORM = true; } + if ( ua.indexOf( "psp" ) != -1 ) UI_PLATFORM = "Sony Playstation Portable"; + if ( os.indexOf( "qnx" ) != -1 ) UI_PLATFORM = "QNX"; + if ( ua.indexOf( "s60" ) != -1 ) UI_PLATFORM = "mobile phones (Series60/S60)"; + if ( ua.indexOf( "series60" ) != -1 ) UI_PLATFORM = "mobile phones (Series60/S60)"; if ( ua.indexOf( "sun4u" ) != -1 ) { UI_PLATFORM = "Solaris SPARC (PKG)"; OLD_PLATFORM = true; } - if ( ua.indexOf( "ppc" ) != -1 || - ua.indexOf( "power_pc" ) != -1 ) { UI_PLATFORM = "Mac OS PPC (DMG)"; + if ( os.indexOf( "sunos" ) != -1 ) { UI_PLATFORM = "Solaris x86 (PKG)"; OLD_PLATFORM = true; } - if ( ua.indexOf( "iphone" ) != -1 || - ua.indexOf( "ipad" ) != -1 || - ua.indexOf( "ipod" ) != -1 ) UI_PLATFORM = "Apple iPhone/iPad/iPod"; - if ( ua.indexOf( "android" ) != -1 || - av.indexOf( "android" ) != -1 ) UI_PLATFORM = "Android mobile devices"; - if ( ua.indexOf( "blackberry" ) != -1 ) UI_PLATFORM = "Blackberry smartphones"; - if ( ua.indexOf( "nokia" ) != -1 ) UI_PLATFORM = "Nokia mobile devices"; - if ( ua.indexOf( "kindle" ) != -1 ) UI_PLATFORM = "Kindle mobile devices"; if ( ua.indexOf( "symbian" ) != -1 ) UI_PLATFORM = "mobile phones (Symbian OS)"; if ( ua.indexOf( "symbos" ) != -1 ) UI_PLATFORM = "mobile phones (Symbian OS)"; - if ( ua.indexOf( "s60" ) != -1 ) UI_PLATFORM = "mobile phones (Series60/S60)"; - if ( ua.indexOf( "series60" ) != -1 ) UI_PLATFORM = "mobile phones (Series60/S60)"; - if ( ua.indexOf( "palm" ) != -1 ) UI_PLATFORM = "mobile phones (Palm OS)"; + if ( os.indexOf( "vms" ) != -1 ) UI_PLATFORM = "OpenVMS"; if ( ua.indexOf( "webos" ) != -1 ) UI_PLATFORM = "mobile phones (Palm webOS)"; - if ( ua.indexOf( "pike" ) != -1 ) UI_PLATFORM = "mobile phones (Pike)"; - if ( ua.indexOf( "ce.net" ) != -1 ) UI_PLATFORM = "mobile phones (Windows CE)"; if ( ua.indexOf( "widerweb" ) != -1 ) UI_PLATFORM = "mobile phones (WiderWeb)"; - if ( ua.indexOf( "brew" ) != -1 ) UI_PLATFORM = "smartphones (BREW)"; - if ( ua.indexOf( "hiptop" ) != -1 ) UI_PLATFORM = "smartphones (Hiptop)"; - if ( ua.indexOf( "playstation" ) != -1 ) UI_PLATFORM = "Sony Playstation"; - if ( ua.indexOf( "psp" ) != -1 ) UI_PLATFORM = "Sony Playstation Portable"; - if ( ua.indexOf( "nintendo" ) != -1 ) UI_PLATFORM = "Nintendo game console"; if ( ua.indexOf( "wii" ) != -1 ) UI_PLATFORM = "Nintendo Wii game console"; + if ( os.indexOf( "x11" ) != -1 ) UI_PLATFORM = "unknown OS (X11 support)"; // If the $UI_PLATFORM variable is already filled, something was recognized and no more work is need. if ( UI_PLATFORM != "" ) return; // Windows, x86 or mobile? - if ( os.indexOf( "windows" ) != -1 || - os.indexOf( "win" ) != -1 ) { UI_PLATFORM = "Windows (EXE)"; + if ( os.indexOf( "win" ) != -1 || + os.indexOf( "windows" ) != -1 ) { UI_PLATFORM = "Windows (EXE)"; URL_PLATFORM = "Win_x86_install"; EXTENSION = ".exe"; - if ( ua.indexOf( "phone" ) != -1 || - ua.indexOf( "mobile" ) != -1 ) UI_PLATFORM = "Windows Mobile device"; + if ( ua.indexOf( "mobile" ) != -1 || + ua.indexOf( "phone" ) != -1 ) UI_PLATFORM = "Windows Mobile device"; } // Linux, x86 or x86-64, DEB or RPM? @@ -1270,9 +1270,9 @@ function getPlatform() { av.indexOf( "i386" ) != -1 ) { UI_PLATFORM = "Linux 32-bit (RPM)"; URL_PLATFORM = "Linux_x86_install-rpm"; EXTENSION = ".tar.gz"; - if ( ua.indexOf( "debian" ) != -1 || - ua.indexOf( "ubuntu" ) != -1 || - ua.indexOf( "iceweasel" ) != -1 ) { UI_PLATFORM = "Linux Debian 32-bit (DEB)"; + if ( ua.indexOf( "debian" ) != -1 || + ua.indexOf( "iceweasel" ) != -1 || + ua.indexOf( "ubuntu" ) != -1 ) { UI_PLATFORM = "Linux Debian 32-bit (DEB)"; URL_PLATFORM = "Linux_x86_install-deb"; EXTENSION = ".tar.gz"; } @@ -1289,8 +1289,8 @@ function getPlatform() { URL_PLATFORM = "Linux_x86-64_install-rpm"; EXTENSION = ".tar.gz"; if ( ua.indexOf( "debian" ) != -1 || - ua.indexOf( "ubuntu" ) != -1 || - ua.indexOf( "iceweasel" ) != -1 ) { UI_PLATFORM = "Linux Debian 64-bit (DEB)"; + ua.indexOf( "iceweasel" ) != -1 || + ua.indexOf( "ubuntu" ) != -1 ) { UI_PLATFORM = "Linux Debian 64-bit (DEB)"; URL_PLATFORM = "Linux_x86-64_install-deb"; EXTENSION = ".tar.gz"; }