";
},"useData":true});
-templates['signup_shell'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+templates['signup_shell'] = template({"1":function(depth0,helpers,partials,data) {
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
- return "
\n
"
- + escapeExpression(((helper = (helper = helpers.signuptosave || (depth0 != null ? depth0.signuptosave : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signuptosave","hash":{},"data":data}) : helper)))
- + "
\n
"
+ return " "
+ + escapeExpression(((helper = (helper = helpers.signinfirefox || (depth0 != null ? depth0.signinfirefox : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signinfirefox","hash":{},"data":data}) : helper)))
+ + "
\n";
+},"3":function(depth0,helpers,partials,data) {
+ var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+ return " "
+ escapeExpression(((helper = (helper = helpers.signupfirefox || (depth0 != null ? depth0.signupfirefox : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signupfirefox","hash":{},"data":data}) : helper)))
- + " "
- + escapeExpression(((helper = (helper = helpers.help || (depth0 != null ? depth0.help : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"help","hash":{},"data":data}) : helper)))
- + "
\n "
+ + "
\n
"
+ escapeExpression(((helper = (helper = helpers.signupemail || (depth0 != null ? depth0.signupemail : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signupemail","hash":{},"data":data}) : helper)))
- + "
\n
"
+ + "
\n";
+},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+ var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "
\n
\n
"
+ + escapeExpression(((helper = (helper = helpers.signuptosave || (depth0 != null ? depth0.signuptosave : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signuptosave","hash":{},"data":data}) : helper)))
+ + "
\n";
+ stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.fxasignedin : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(3, data),"data":data});
+ if (stack1 != null) { buffer += stack1; }
+ return buffer + "
"
+ escapeExpression(((helper = (helper = helpers.alreadyhaveacct || (depth0 != null ? depth0.alreadyhaveacct : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"alreadyhaveacct","hash":{},"data":data}) : helper)))
- + " "
+ + " "
+ + escapeExpression(((helper = (helper = helpers.loginnow || (depth0 != null ? depth0.loginnow : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"loginnow","hash":{},"data":data}) : helper)))
+ + ".
\n
";
+},"useData":true});
+templates['signupstoryboard_shell'] = template({"1":function(depth0,helpers,partials,data) {
+ var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+ return "
"
+ + escapeExpression(((helper = (helper = helpers.signinfirefox || (depth0 != null ? depth0.signinfirefox : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signinfirefox","hash":{},"data":data}) : helper)))
+ + "
\n";
+},"3":function(depth0,helpers,partials,data) {
+ var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+ return "
"
+ + escapeExpression(((helper = (helper = helpers.signupfirefox || (depth0 != null ? depth0.signupfirefox : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signupfirefox","hash":{},"data":data}) : helper)))
+ + "
\n
"
+ + escapeExpression(((helper = (helper = helpers.signupemail || (depth0 != null ? depth0.signupemail : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signupemail","hash":{},"data":data}) : helper)))
+ + "
\n";
+},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+ var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "
\n
\n
\n
"
+ + escapeExpression(((helper = (helper = helpers.taglinestory_one || (depth0 != null ? depth0.taglinestory_one : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"taglinestory_one","hash":{},"data":data}) : helper)))
+ + "
\n
\n
\n
\n
\n
\n
\n
"
+ + escapeExpression(((helper = (helper = helpers.taglinestory_two || (depth0 != null ? depth0.taglinestory_two : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"taglinestory_two","hash":{},"data":data}) : helper)))
+ + "
\n
"
+ + escapeExpression(((helper = (helper = helpers.learnmore || (depth0 != null ? depth0.learnmore : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"learnmore","hash":{},"data":data}) : helper)))
+ + "
\n
\n
\n
\n
\n
\n
"
+ + escapeExpression(((helper = (helper = helpers.signuptosave || (depth0 != null ? depth0.signuptosave : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signuptosave","hash":{},"data":data}) : helper)))
+ + "
\n";
+ stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.fxasignedin : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(3, data),"data":data});
+ if (stack1 != null) { buffer += stack1; }
+ return buffer + "
"
+ + escapeExpression(((helper = (helper = helpers.alreadyhaveacct || (depth0 != null ? depth0.alreadyhaveacct : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"alreadyhaveacct","hash":{},"data":data}) : helper)))
+ + " "
+ escapeExpression(((helper = (helper = helpers.loginnow || (depth0 != null ? depth0.loginnow : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"loginnow","hash":{},"data":data}) : helper)))
+ ".
\n
";
},"useData":true});
diff --git a/browser/components/pocket/panels/LICENSE b/browser/components/pocket/panels/license.txt
similarity index 93%
rename from browser/components/pocket/panels/LICENSE
rename to browser/components/pocket/panels/license.txt
index c122b8fd7b45..7f3f806bab56 100644
--- a/browser/components/pocket/panels/LICENSE
+++ b/browser/components/pocket/panels/license.txt
@@ -9,7 +9,7 @@ to the license set forth below, "Pocket," "Read It Later" and the Pocket icon
and logos (collectively, the “Pocket Marks”) are registered and common law
trademarks of Read It Later, Inc. This means that, while you have considerable
freedom to redistribute and modify the Software, there are tight restrictions
-on your ability to use the Pocket Marks. This license does not grant you any
+on your ability to use the Pocket Marks. This license does not grant you any
rights to use the Pocket Marks except as they are embodied in the Software.
---
diff --git a/browser/components/pocket/panels/tmpl/saved_shell.handlebars b/browser/components/pocket/panels/tmpl/saved_shell.handlebars
index af1cd04c45a6..ff943dd363fe 100644
--- a/browser/components/pocket/panels/tmpl/saved_shell.handlebars
+++ b/browser/components/pocket/panels/tmpl/saved_shell.handlebars
@@ -5,11 +5,12 @@
diff --git a/browser/components/pocket/panels/tmpl/signup_shell.handlebars b/browser/components/pocket/panels/tmpl/signup_shell.handlebars
index 8b9d361cd418..300f1e2b620a 100644
--- a/browser/components/pocket/panels/tmpl/signup_shell.handlebars
+++ b/browser/components/pocket/panels/tmpl/signup_shell.handlebars
@@ -1,13 +1,16 @@
-
Recommended by Firefox
\ No newline at end of file
diff --git a/browser/components/pocket/panels/tmpl/signupstoryboard_shell.handlebars b/browser/components/pocket/panels/tmpl/signupstoryboard_shell.handlebars
new file mode 100644
index 000000000000..0b2457bccdbb
--- /dev/null
+++ b/browser/components/pocket/panels/tmpl/signupstoryboard_shell.handlebars
@@ -0,0 +1,26 @@
+
+
+
+
+
+
{{taglinestory_two}}
+
{{learnmore}}
+
+
+
+
+
\ No newline at end of file
diff --git a/browser/components/pocket/pktApi.js b/browser/components/pocket/pktApi.js
index a2bed9e5fb58..325e7429c455 100644
--- a/browser/components/pocket/pktApi.js
+++ b/browser/components/pocket/pktApi.js
@@ -50,7 +50,8 @@ var pktApi = (function() {
// Base url for all api calls
// TODO: This is a dev server and will be changed before launch
- var pocketAPIhost = Services.prefs.getCharPref("browser.pocket.hostname");
+ var pocketAPIhost = Services.prefs.getCharPref("browser.pocket.api");
+ var pocketSiteHost = Services.prefs.getCharPref("browser.pocket.site");
// Base url for all api calls
var baseAPIUrl = "https://" + pocketAPIhost + "/v3";
@@ -139,7 +140,7 @@ var pktApi = (function() {
function getCookiesFromPocket() {
var cookieManager = Cc["@mozilla.org/cookiemanager;1"].getService(Ci.nsICookieManager2);
- var pocketCookies = cookieManager.getCookiesFromHost(pocketAPIhost);
+ var pocketCookies = cookieManager.getCookiesFromHost(pocketSiteHost);
var cookies = {};
while (pocketCookies.hasMoreElements()) {
var cookie = pocketCookies.getNext().QueryInterface(Ci.nsICookie2);
@@ -225,6 +226,12 @@ var pktApi = (function() {
// TODO: Better error handling
if (options.error) {
+ // In case the user did revoke the access token or it's not
+ // valid anymore clear the user data
+ if (request.status === 401) {
+ clearUserData();
+ }
+
// Check to handle Pocket error
var errorMessage = request.getResponseHeader("X-Error");
if (typeof errorMessage !== "undefined") {
@@ -238,9 +245,6 @@ var pktApi = (function() {
}
};
- // TODO - do we want to pass a special user agent?
- //request.setRequestHeader("User-Agent" , 'Pocket Firefox ' + this.APP.v);
-
// Set headers
request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
request.setRequestHeader('X-Accept',' application/json');
@@ -268,6 +272,7 @@ var pktApi = (function() {
setSetting("tags", undefined);
setSetting("usedTags", undefined);
+ setSetting("fsv1", undefined);
}
/**
@@ -321,8 +326,6 @@ var pktApi = (function() {
},
error: options.error
});
-
- return sendAction(action, options);
}
/**
@@ -444,7 +447,7 @@ var pktApi = (function() {
var tagToSave = tags[i].trim();
var newUsedTagObject = {
"tag": tagToSave,
- "timestamp": new Date()
+ "timestamp": new Date().getTime()
};
usedTags[tagToSave] = newUsedTagObject;
}
@@ -488,9 +491,9 @@ var pktApi = (function() {
}
// Sort usedTagsObjectArray based on timestamp
- usedTagsObjectArray.sort(function(a, b) {
- a = new Date(a.timestamp);
- b = new Date(b.timestamp);
+ usedTagsObjectArray.sort(function(usedTagA, usedTagB) {
+ var a = usedTagA.timestamp;
+ var b = usedTagB.timestamp;
return a < b ? -1 : a > b ? 1 : 0;
});
@@ -563,6 +566,26 @@ var pktApi = (function() {
});
}
+ /**
+ * Helper function to get current signup AB group the user is in
+ */
+ function getSignupAB() {
+ if (!getSetting('signupAB'))
+ {
+ var rand = (Math.floor(Math.random()*2+1));
+ if (rand == 2)
+ {
+ setSetting('signupAB','storyboard');
+ }
+ else
+ {
+ setSetting('signupAB','hero');
+ }
+
+ }
+ return getSetting('signupAB');
+ }
+
/**
* Public functions
*/
@@ -576,6 +599,7 @@ var pktApi = (function() {
getTags: getTags,
isPremiumUser: isPremiumUser,
getSuggestedTagsForItem: getSuggestedTagsForItem,
- getSuggestedTagsForURL: getSuggestedTagsForURL
+ getSuggestedTagsForURL: getSuggestedTagsForURL,
+ getSignupAB: getSignupAB
};
-}());
\ No newline at end of file
+}());