Bug 1165416 - Update Pocket code to latest version (May 15th code drop). r=dolske, r=jaws, a=sledru
authorNate Weiner <nate@readitlater.com>
Fri, 15 May 2015 19:04:03 -0400
changeset 260523 e6f89a184268
parent 260522 f9328a6ea6bd
child 260524 f5828f333524
push id807
push userryanvm@gmail.com
push date2015-05-18 18:43 +0000
treeherdermozilla-release@f5828f333524 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdolske, jaws, sledru
bugs1165416
milestone38.0.5
Bug 1165416 - Update Pocket code to latest version (May 15th code drop). r=dolske, r=jaws, a=sledru
browser/components/pocket/panels/css/signup.css
browser/components/pocket/pktApi.js
--- a/browser/components/pocket/panels/css/signup.css
+++ b/browser/components/pocket/panels/css/signup.css
@@ -385,9 +385,15 @@
 .pkt_ext_signup_ru .pkt_ext_logo {
     padding-top: 15px;
 }
 .pkt_ext_signup_de .pkt_ext_introdetailhero .pkt_ext_tagline,
 .pkt_ext_signup_es .pkt_ext_introdetailhero .pkt_ext_tagline,
 .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
--- a/browser/components/pocket/pktApi.js
+++ b/browser/components/pocket/pktApi.js
@@ -599,38 +599,31 @@ var pktApi = (function() {
             error: options.error
         });
     }
 
     /**
      * 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)
-            {
-                setSetting('signupAB','storyboard_nlm');
-            }
-            else if (rand > 90)
+            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;
     }
 
     /**
      * Public functions
      */
     return {
         isUserLoggedIn : isUserLoggedIn,
         clearUserData: clearUserData,