From 6cbeb26738f6a472084ce69d1ac06908bb5bf335 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 27 Jan 2014 12:06:11 -0800 Subject: fix js platform detection to match new way we have single link for linux (not linux32 or linux64). --- app/assets/stylesheets/leap.scss | 23 ++++++++++++++--------- core/app/assets/javascripts/platform.js | 11 ++++++----- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss index 120b978..4c0dfe3 100644 --- a/app/assets/stylesheets/leap.scss +++ b/app/assets/stylesheets/leap.scss @@ -55,21 +55,26 @@ html.android .os-android { display: inherit !important; } -.os-linux32 { +.os-linux { display: none !important; } -html.linux32 .os-linux32 { +html.linux .os-linux { display: inherit !important; } -.os-linux64 { - display: none !important; -} - -html.linux64 .os-linux64 { - display: inherit !important; -} +// .os-linux32 { +// display: none !important; +// } +// html.linux32 .os-linux32 { +// display: inherit !important; +// } +// .os-linux64 { +// display: none !important; +// } +// html.linux64 .os-linux64 { +// display: inherit !important; +// } .os-windows { display: none !important; diff --git a/core/app/assets/javascripts/platform.js b/core/app/assets/javascripts/platform.js index 3ab77d7..108c162 100644 --- a/core/app/assets/javascripts/platform.js +++ b/core/app/assets/javascripts/platform.js @@ -46,11 +46,12 @@ return 'android'; } if (pf.indexOf("Linux") !== -1) { - if (pf.indexOf("64") !== -1) { - return 'linux64'; - } else { - return 'linux32'; - } + return 'linux'; + //if (pf.indexOf("64") !== -1) { + // return 'linux64'; + //} else { + // return 'linux32'; + //} } if (pf.indexOf("MacPPC") !== -1) { return 'oldmac'; -- cgit v1.2.3