Commit 54768269 authored by Scott's avatar Scott
Browse files

Bug 1686977 - remove fxa only option from save to pocket button. r=gvn 

Differential Revision: https://phabricator.services.mozilla.com/D101949
parent e0c52eb7

browser/components/pocket/content/main.js

+0 −7
Original line number Diff line number Diff line
@@ -140,8 +140,6 @@ var pktUI = (function() { 


    // Control: Show panel as normal

    getFirefoxAccountSignedInUser(function(userdata) {

      var fxasignedin =

        typeof userdata == "object" && userdata !== null ? "1" : "0";

      var startheight = 490;

      var inOverflowMenu = isInOverflowMenu();

      var controlvariant = pktApi.getSignupPanelTabTestVariant() == "control";
@@ -150,9 +148,6 @@ var pktUI = (function() { 
        startheight = overflowMenuHeight;

      } else {

        startheight = 460;

        if (fxasignedin == "1") {

          startheight = 406;

        }

      }

      if (!controlvariant) {

        startheight = 427;
@@ -169,8 +164,6 @@ var pktUI = (function() { 
          Services.prefs.getCharPref("extensions.pocket.site") +

          "&loggedOutVariant=" +

          Services.prefs.getCharPref("extensions.pocket.loggedOutVariant") +

          "&fxasignedin=" +

          fxasignedin +

          "&variant=" +

          variant +

          "&controlvariant=" +

browser/components/pocket/content/panels/js/signup.js

+0 −7
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ var PKT_SIGNUP_OVERLAY = function(options) { 
  this.inoverflowmenu = false;

  this.controlvariant;

  this.pockethost = "getpocket.com";

  this.fxasignedin = false;

  this.loggedOutVariant = "control";

  this.dictJSON = {};

  this.initCloseTabEvents = function() {
@@ -109,10 +108,6 @@ PKT_SIGNUP_OVERLAY.prototype = { 
    if (loggedOutVariant && loggedOutVariant.length > 1) {

      this.loggedOutVariant = loggedOutVariant[1];

    }

    var fxasignedin = window.location.href.match(/fxasignedin=([\w|\d|\.]*)&?/);

    if (fxasignedin && fxasignedin.length > 1) {

      this.fxasignedin = fxasignedin[1] == "1";

    }

    var host = window.location.href.match(/pockethost=([\w|\.]*)&?/);

    if (host && host.length > 1) {

      this.pockethost = host[1];
@@ -135,10 +130,8 @@ PKT_SIGNUP_OVERLAY.prototype = { 


    // set translations

    this.getTranslations();

    this.dictJSON.fxasignedin = this.fxasignedin ? 1 : 0;

    this.dictJSON.controlvariant = this.controlvariant == "true" ? 1 : 0;

    this.dictJSON.variant = this.variant ? this.variant : "undefined";

    this.dictJSON.variant += this.fxasignedin ? "_fxa" : "_nonfxa";

    this.dictJSON.pockethost = this.pockethost;

    this.dictJSON.showlearnmore = true;

browser/components/pocket/content/panels/js/tmpl.js

+20 −68
Original line number Diff line number Diff line
@@ -118,30 +118,6 @@ templates['signup_shell'] = template({"1":function(depth0,helpers,partials,data) 
},"8":function(depth0,helpers,partials,data) {

    var helper, alias1=helpers.helperMissing, alias2="function", alias3=this.escapeExpression;



  return "	<h4>"

    + alias3(((helper = (helper = helpers.signuptosave || (depth0 != null ? depth0.signuptosave : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"signuptosave","hash":{},"data":data}) : helper)))

    + "</h4>\n	<p class=\"btn-container\"><a href=\"https://"

    + alias3(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"pockethost","hash":{},"data":data}) : helper)))

    + "/ff_signup?utm_campaign=logged_out_save_test&utm_source=control&s=ffi&t=signupff&v="

    + alias3(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"variant","hash":{},"data":data}) : helper)))

    + "\" target=\"_blank\" class=\"btn signup-btn-firefox\"><span class=\"logo\"></span><span class=\"text\">"

    + alias3(((helper = (helper = helpers.signupfirefox || (depth0 != null ? depth0.signupfirefox : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"signupfirefox","hash":{},"data":data}) : helper)))

    + "</span></a></p>\n	<p class=\"alreadyhave\">"

    + alias3(((helper = (helper = helpers.alreadyhaveacct || (depth0 != null ? depth0.alreadyhaveacct : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"alreadyhaveacct","hash":{},"data":data}) : helper)))

    + " <a class=\"pkt_ext_login\" href=\"https://"

    + alias3(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"pockethost","hash":{},"data":data}) : helper)))

    + "/login?utm_campaign=logged_out_save_test&utm_source=control&ep=3&src=extension&s=ffi&t=login&v="

    + alias3(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"variant","hash":{},"data":data}) : helper)))

    + "\" target=\"_blank\">"

    + alias3(((helper = (helper = helpers.loginnow || (depth0 != null ? depth0.loginnow : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"loginnow","hash":{},"data":data}) : helper)))

    + "</a>.</p>\n";

},"10":function(depth0,helpers,partials,data) {

    var stack1;



  return ((stack1 = helpers['if'].call(depth0,(depth0 != null ? depth0.controlvariant : depth0),{"name":"if","hash":{},"fn":this.program(11, data, 0),"inverse":this.program(13, data, 0),"data":data})) != null ? stack1 : "");

},"11":function(depth0,helpers,partials,data) {

    var helper, alias1=helpers.helperMissing, alias2="function", alias3=this.escapeExpression;



  return "		<h4>"

    + alias3(((helper = (helper = helpers.signuptosave || (depth0 != null ? depth0.signuptosave : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"signuptosave","hash":{},"data":data}) : helper)))

    + "</h4>\n		<p class=\"btn-container\"><a href=\"https://"
@@ -165,7 +141,7 @@ templates['signup_shell'] = template({"1":function(depth0,helpers,partials,data) 
    + "\" target=\"_blank\">"

    + alias3(((helper = (helper = helpers.loginnow || (depth0 != null ? depth0.loginnow : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"loginnow","hash":{},"data":data}) : helper)))

    + "</a>.</p>\n";

},"13":function(depth0,helpers,partials,data) {

},"10":function(depth0,helpers,partials,data) {

    var stack1, helper, alias1=helpers.helperMissing, alias2="function", alias3=this.escapeExpression;



  return "		<p class=\"btn-container\"><a href=\"https://"
@@ -191,8 +167,8 @@ templates['signup_shell'] = template({"1":function(depth0,helpers,partials,data) 
    + "</p>\n"

    + ((stack1 = helpers['if'].call(depth0,(depth0 != null ? depth0.showlearnmore : depth0),{"name":"if","hash":{},"fn":this.program(1, data, 0),"inverse":this.program(6, data, 0),"data":data})) != null ? stack1 : "")

    + "	<div class=\"pkt_ext_introimg\"></div>\n</div>\n<div class=\"pkt_ext_signupdetail pkt_ext_signupdetail_hero\">\n"

    + ((stack1 = helpers['if'].call(depth0,(depth0 != null ? depth0.fxasignedin : depth0),{"name":"if","hash":{},"fn":this.program(8, data, 0),"inverse":this.program(10, data, 0),"data":data})) != null ? stack1 : "")

    + "</div>\n";

    + ((stack1 = helpers['if'].call(depth0,(depth0 != null ? depth0.controlvariant : depth0),{"name":"if","hash":{},"fn":this.program(8, data, 0),"inverse":this.program(10, data, 0),"data":data})) != null ? stack1 : "")

    + "\n</div>\n";

},"useData":true});

templates['signupstoryboard_shell'] = template({"1":function(depth0,helpers,partials,data) {

    var stack1;
@@ -227,30 +203,6 @@ templates['signupstoryboard_shell'] = template({"1":function(depth0,helpers,part 
},"8":function(depth0,helpers,partials,data) {

    var helper, alias1=helpers.helperMissing, alias2="function", alias3=this.escapeExpression;



  return "	<h4>"

    + alias3(((helper = (helper = helpers.signuptosave || (depth0 != null ? depth0.signuptosave : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"signuptosave","hash":{},"data":data}) : helper)))

    + "</h4>\n	<p class=\"btn-container\"><a href=\"https://"

    + alias3(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"pockethost","hash":{},"data":data}) : helper)))

    + "/ff_signup?utm_campaign=logged_out_save_test&utm_source=control&s=ffi&t=signupff&v="

    + alias3(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"variant","hash":{},"data":data}) : helper)))

    + "\" target=\"_blank\" class=\"btn signup-btn-firefox\"><span class=\"logo\"></span><span class=\"text\">"

    + alias3(((helper = (helper = helpers.signupfirefox || (depth0 != null ? depth0.signupfirefox : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"signupfirefox","hash":{},"data":data}) : helper)))

    + "</span></a></p>\n	<p class=\"alreadyhave\">"

    + alias3(((helper = (helper = helpers.alreadyhaveacct || (depth0 != null ? depth0.alreadyhaveacct : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"alreadyhaveacct","hash":{},"data":data}) : helper)))

    + " <a class=\"pkt_ext_login\" href=\"https://"

    + alias3(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"pockethost","hash":{},"data":data}) : helper)))

    + "/login?utm_campaign=logged_out_save_test&utm_source=control&ep=3&src=extension&s=ffi&t=login&v="

    + alias3(((helper = (helper = helpers.variant || (depth0 != null ? depth0.variant : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"variant","hash":{},"data":data}) : helper)))

    + "\" target=\"_blank\">"

    + alias3(((helper = (helper = helpers.loginnow || (depth0 != null ? depth0.loginnow : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"loginnow","hash":{},"data":data}) : helper)))

    + "</a>.</p>\n";

},"10":function(depth0,helpers,partials,data) {

    var stack1;



  return ((stack1 = helpers['if'].call(depth0,(depth0 != null ? depth0.controlvariant : depth0),{"name":"if","hash":{},"fn":this.program(11, data, 0),"inverse":this.program(13, data, 0),"data":data})) != null ? stack1 : "");

},"11":function(depth0,helpers,partials,data) {

    var helper, alias1=helpers.helperMissing, alias2="function", alias3=this.escapeExpression;



  return "		<h4>"

    + alias3(((helper = (helper = helpers.signuptosave || (depth0 != null ? depth0.signuptosave : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"signuptosave","hash":{},"data":data}) : helper)))

    + "</h4>\n		<p class=\"btn-container\"><a href=\"https://"
@@ -274,7 +226,7 @@ templates['signupstoryboard_shell'] = template({"1":function(depth0,helpers,part 
    + "\" target=\"_blank\">"

    + alias3(((helper = (helper = helpers.loginnow || (depth0 != null ? depth0.loginnow : depth0)) != null ? helper : alias1),(typeof helper === alias2 ? helper.call(depth0,{"name":"loginnow","hash":{},"data":data}) : helper)))

    + "</a>.</p>\n";

},"13":function(depth0,helpers,partials,data) {

},"10":function(depth0,helpers,partials,data) {

    var stack1, helper, alias1=helpers.helperMissing, alias2="function", alias3=this.escapeExpression;



  return "		<p class=\"btn-container\"><a href=\"https://"
@@ -302,8 +254,8 @@ templates['signupstoryboard_shell'] = template({"1":function(depth0,helpers,part 
    + "</p>\n"

    + ((stack1 = helpers['if'].call(depth0,(depth0 != null ? depth0.showlearnmore : depth0),{"name":"if","hash":{},"fn":this.program(1, data, 0),"inverse":this.program(6, data, 0),"data":data})) != null ? stack1 : "")

    + "		</div>\n		<div class=\"pkt_ext_introstorytwo_img\"></div>\n	</div>\n</div>\n<div class=\"pkt_ext_signupdetail\">\n"

    + ((stack1 = helpers['if'].call(depth0,(depth0 != null ? depth0.fxasignedin : depth0),{"name":"if","hash":{},"fn":this.program(8, data, 0),"inverse":this.program(10, data, 0),"data":data})) != null ? stack1 : "")

    + "\n</div>\n\n";

    + ((stack1 = helpers['if'].call(depth0,(depth0 != null ? depth0.controlvariant : depth0),{"name":"if","hash":{},"fn":this.program(8, data, 0),"inverse":this.program(10, data, 0),"data":data})) != null ? stack1 : "")

    + "</div>\n\n";

},"useData":true});

templates['item_recs'] = template({"1":function(depth0,helpers,partials,data) {

    return "  <h4>Similar Stories</h4>\n";

browser/components/pocket/content/panels/tmpl/signup_shell.handlebars

+9 −14
Original line number Diff line number Diff line
@@ -13,11 +13,6 @@ 
	<div class="pkt_ext_introimg"></div>

</div>

<div class="pkt_ext_signupdetail pkt_ext_signupdetail_hero">

	{{#if fxasignedin}}

	<h4>{{signuptosave}}</h4>

	<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?utm_campaign=logged_out_save_test&utm_source=control&s=ffi&t=signupff&v={{variant}}" target="_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signupfirefox}}</span></a></p>

	<p class="alreadyhave">{{alreadyhaveacct}} <a class="pkt_ext_login" href="https://{{pockethost}}/login?utm_campaign=logged_out_save_test&utm_source=control&ep=3&src=extension&s=ffi&t=login&v={{variant}}" target="_blank">{{loginnow}}</a>.</p>

	{{else}}

	{{#if controlvariant}}

		<h4>{{signuptosave}}</h4>

		<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?utm_campaign=logged_out_save_test&utm_source=control&s=ffi&tv=panel_control&t=signupff&v={{variant}}" target="_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signupfirefox}}</span></a></p>
@@ -28,5 +23,5 @@ 
		<p class="alreadyhave tryitnowspace">{{alreadyhaveacct}} <a class="pkt_ext_login" href="https://{{pockethost}}/login?utm_campaign=logged_out_save_test&utm_source=control&ep=3&s=ffi&tv=panel_tryit&src=extension&t=login&v={{variant}}" target="_blank">{{loginnow}}</a>.</p>

		<p class="pkt_ext_tos">{{{tos}}}</p>

	{{/if}}

	{{/if}}



</div>

browser/components/pocket/content/panels/tmpl/signupstoryboard_shell.handlebars

+8 −15
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ 
	</div>

</div>

<div class="pkt_ext_signupdetail">

	{{#if fxasignedin}}

	<h4>{{signuptosave}}</h4>

	<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?utm_campaign=logged_out_save_test&utm_source=control&s=ffi&t=signupff&v={{variant}}" target="_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signupfirefox}}</span></a></p>

	<p class="alreadyhave">{{alreadyhaveacct}} <a class="pkt_ext_login" href="https://{{pockethost}}/login?utm_campaign=logged_out_save_test&utm_source=control&ep=3&src=extension&s=ffi&t=login&v={{variant}}" target="_blank">{{loginnow}}</a>.</p>

	{{else}}

	{{#if controlvariant}}

		<h4>{{signuptosave}}</h4>

		<p class="btn-container"><a href="https://{{pockethost}}/ff_signup?utm_campaign=logged_out_save_test&utm_source=control&s=ffi&tv=panel_control&t=signupff&v={{variant}}" target="_blank" class="btn signup-btn-firefox"><span class="logo"></span><span class="text">{{signupfirefox}}</span></a></p>
@@ -38,7 +33,5 @@ 
		<p class="alreadyhave tryitnowspace">{{alreadyhaveacct}} <a class="pkt_ext_login" href="https://{{pockethost}}/login?utm_campaign=logged_out_save_test&utm_source=control&ep=3&s=ffi&tv=panel_tryit&src=extension&t=login&v={{variant}}" target="_blank">{{loginnow}}</a>.</p>

		<p class="pkt_ext_tos">{{{tos}}}</p>

	{{/if}}

	{{/if}}



</div>