From a3d3a6b03c6b8fc9736628a0b3b1877f18c94310 Mon Sep 17 00:00:00 2001 From: Nate Weiner Date: Fri, 15 May 2015 19:04:03 -0400 Subject: [PATCH] Bug 1165416 - Update Pocket code to latest version (May 15th code drop). r=dolske, r=jaws, a=sledru --- .../components/pocket/panels/css/signup.css | 6 ++++++ browser/components/pocket/pktApi.js | 21 +++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/browser/components/pocket/panels/css/signup.css b/browser/components/pocket/panels/css/signup.css index e984d7204c08..5cdcdd7dc4a4 100644 --- a/browser/components/pocket/panels/css/signup.css +++ b/browser/components/pocket/panels/css/signup.css @@ -390,4 +390,10 @@ .pkt_ext_signup_ja .pkt_ext_introdetailhero .pkt_ext_tagline, .pkt_ext_signup_ru .pkt_ext_introdetailhero .pkt_ext_tagline { font-size: 13px; +} +.pkt_ext_signup_overflow.pkt_ext_signup_de .signup-btn-firefox .logo, +.pkt_ext_signup_overflow.pkt_ext_signup_es .signup-btn-firefox .logo, +.pkt_ext_signup_overflow.pkt_ext_signup_ja .signup-btn-firefox .logo, +.pkt_ext_signup_overflow.pkt_ext_signup_ru .signup-btn-firefox .logo { + display: none; } \ No newline at end of file diff --git a/browser/components/pocket/pktApi.js b/browser/components/pocket/pktApi.js index 1d806430ee87..8a1bbba0f4b0 100644 --- a/browser/components/pocket/pktApi.js +++ b/browser/components/pocket/pktApi.js @@ -604,28 +604,21 @@ var pktApi = (function() { * Helper function to get current signup AB group the user is in */ function getSignupAB() { - if (!getSetting('signupAB')) + var setting = getSetting('signupAB'); + if (!setting || setting.contains('hero')) { var rand = (Math.floor(Math.random()*100+1)); - if (rand > 95) + if (rand > 90) { - setSetting('signupAB','storyboard_nlm'); - } - else if (rand > 90) - { - setSetting('signupAB','hero_nlm'); - } - else if (rand > 45) - { - setSetting('signupAB','storyboard_lm'); + setting = 'storyboard_nlm'; } else { - setSetting('signupAB','hero_lm'); + setting = 'storyboard_lm'; } - + setSetting('signupAB',setting); } - return getSetting('signupAB'); + return setting; } /**