Author: buildbot
Date: Tue Jun 3 22:24:39 2014
New Revision: 911186
Log:
Staging update by buildbot for ooo-site
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_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 22:24:39 2014
@@ -1 +1 @@
-1599785
+1599816
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 3 22:24:39 2014
@@ -1 +1 @@
-1599785
+1599816
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Tue Jun 3 22:24:39 2014
@@ -1467,15 +1467,17 @@ function getPlatform() {
};
}
+ alert( os );
+
if( os ) {
// Recognized but *not supported* platforms/OS, set
$UI_PLATFORM_NO_SUP to show it to the user.
// Mobile devices.
+
if( ua.indexOf( "android" ) !== -1 )
if( ua.indexOf( "nexus" ) !== -1 &&
ve.indexOf( "google" ) !== -1 )
UI_PLATFORM_NO_SUP = "Google Nexus";
else if( ua.indexOf( "moble" ) !== -1 )
UI_PLATFORM_NO_SUP = "mobile devices (Android)";
-
if( os.indexOf( "arm" ) !== -1 )
UI_PLATFORM_NO_SUP = "mobile devices (ARM processor)";
if( ua.indexOf( "blackberry" ) !== -1 )
UI_PLATFORM_NO_SUP = "Blackberry smartphones";
if( ua.indexOf( "brew" ) !== -1 )
UI_PLATFORM_NO_SUP = "smartphones (BREW)";
@@ -1535,9 +1537,10 @@ function getPlatform() {
}
// If $UI_PLATFORM_NO_SUP is already filled, something was
recognized and no more work is needed.
- if( UI_PLATFORM_NO_SUP !== "" )
+ if( UI_PLATFORM_NO_SUP !== "" ) {
ERROR = true;
return PLATFORM;
+ }
// Recognized and *supported* platforms/OS, set $UI_PLATFORM to
show it to the user.
