mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 06:45:42 +00:00
Backed out changeset adadd752ff08 (bug 1163111) for dt orange CLOSED TREE
This commit is contained in:
Wes Kocher
parent
e7b5798144
commit
8ec4f41116
@ -12,8 +12,6 @@ browser.jar:
|
||||
content/browser/pocket/panels/css/saved.css (panels/css/saved.css)
|
||||
content/browser/pocket/panels/css/signup.css (panels/css/signup.css)
|
||||
content/browser/pocket/panels/fonts/FiraSans-Regular.woff (panels/fonts/FiraSans-Regular.woff)
|
||||
content/browser/pocket/panels/img/pocketerror@1x.png (panels/img/pocketerror@1x.png)
|
||||
content/browser/pocket/panels/img/pocketerror@2x.png (panels/img/pocketerror@2x.png)
|
||||
content/browser/pocket/panels/img/pocketlogo@1x.png (panels/img/pocketlogo@1x.png)
|
||||
content/browser/pocket/panels/img/pocketlogo@2x.png (panels/img/pocketlogo@2x.png)
|
||||
content/browser/pocket/panels/img/pocketlogosolo@1x.png (panels/img/pocketlogosolo@1x.png)
|
||||
@ -42,7 +40,6 @@ browser.jar:
|
||||
content/browser/pocket/panels/js/vendor/jquery-2.1.1.min.js (panels/js/vendor/jquery-2.1.1.min.js)
|
||||
content/browser/pocket/panels/js/vendor/handlebars.runtime.js (panels/js/vendor/handlebars.runtime.js)
|
||||
content/browser/pocket/panels/js/vendor/jquery.tokeninput.min.js (panels/js/vendor/jquery.tokeninput.min.js)
|
||||
content/browser/pocket/panels/tmpl/saved_premiumextras.handlebars (panels/tmpl/saved_premiumextras.handlebars)
|
||||
content/browser/pocket/panels/tmpl/saved_premiumshell.handlebars (panels/tmpl/saved_premiumshell.handlebars)
|
||||
content/browser/pocket/panels/tmpl/saved_shell.handlebars (panels/tmpl/saved_shell.handlebars)
|
||||
content/browser/pocket/panels/tmpl/signup_shell.handlebars (panels/tmpl/signup_shell.handlebars)
|
||||
|
||||
@ -49,21 +49,13 @@ var pktUI = (function() {
|
||||
|
||||
// -- Initialization (on startup and new windows) -- //
|
||||
var inited = false;
|
||||
var _currentPanelDidShow;
|
||||
var _currentPanelDidHide;
|
||||
var currentPanelDidShow, currentPanelDidHide;
|
||||
var _isHidden = false;
|
||||
|
||||
var _notificationTimeout;
|
||||
|
||||
// Init panel id at 0. The first actual panel id will have the number 1 so
|
||||
// in case at some point any panel has the id 0 we know there is something
|
||||
// wrong
|
||||
var _panelId = 0;
|
||||
|
||||
var prefBranch = Services.prefs.getBranch("browser.pocket.settings.");
|
||||
|
||||
var savePanelWidth = 350;
|
||||
var savePanelHeights = {collapsed: 153, expanded: 272};
|
||||
|
||||
|
||||
var prefBranch = Services.prefs.getBranch("browser.pocket.settings.");
|
||||
|
||||
/**
|
||||
* Initalizes Pocket UI and panels
|
||||
*/
|
||||
@ -170,15 +162,15 @@ var pktUI = (function() {
|
||||
}
|
||||
|
||||
function pocketPanelDidShow(event) {
|
||||
if (_currentPanelDidShow) {
|
||||
_currentPanelDidShow(event);
|
||||
if (currentPanelDidShow) {
|
||||
currentPanelDidShow(event);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function pocketPanelDidHide(event) {
|
||||
if (_currentPanelDidHide) {
|
||||
_currentPanelDidHide(event);
|
||||
if (currentPanelDidHide) {
|
||||
currentPanelDidHide(event);
|
||||
}
|
||||
|
||||
// clear the panel
|
||||
@ -307,7 +299,7 @@ var pktUI = (function() {
|
||||
startheight = 436;
|
||||
}
|
||||
}
|
||||
var panelId = showPanel("chrome://browser/content/pocket/panels/signup.html?pockethost=" + Services.prefs.getCharPref("browser.pocket.site") + "&fxasignedin=" + fxasignedin + "&variant=" + pktApi.getSignupAB(), {
|
||||
showPanel("chrome://browser/content/pocket/panels/signup.html?pockethost=" + Services.prefs.getCharPref("browser.pocket.site") + "&fxasignedin=" + fxasignedin + "&variant=" + pktApi.getSignupAB(), {
|
||||
onShow: function() {
|
||||
},
|
||||
onHide: panelDidHide,
|
||||
@ -329,30 +321,15 @@ var pktUI = (function() {
|
||||
|
||||
var isValidURL = (typeof url !== 'undefined' && (url.startsWith("http") || url.startsWith('https')));
|
||||
|
||||
var panelId = showPanel("chrome://browser/content/pocket/panels/saved.html?pockethost=" + Services.prefs.getCharPref("browser.pocket.site") + "&premiumStatus=" + (pktApi.isPremiumUser() ? '1' : '0'), {
|
||||
showPanel("chrome://browser/content/pocket/panels/saved.html?pockethost=" + Services.prefs.getCharPref("browser.pocket.site") + "&premiumStatus=" + (pktApi.isPremiumUser() ? '1' : '0'), {
|
||||
onShow: function() {
|
||||
var saveLinkMessageId = 'saveLink';
|
||||
|
||||
// Send error message for invalid url
|
||||
if (!isValidURL) {
|
||||
// TODO: Pass key for localized error in error object
|
||||
var error = {
|
||||
message: 'Only links can be saved',
|
||||
localizedKey: "onlylinkssaved"
|
||||
};
|
||||
pktUIMessaging.sendErrorMessageToPanel(panelId, saveLinkMessageId, error);
|
||||
var error = new Error('Only links can be saved');
|
||||
sendErrorMessage('saveLink', error);
|
||||
return;
|
||||
}
|
||||
|
||||
// Check online state
|
||||
if (!navigator.onLine) {
|
||||
// TODO: Pass key for localized error in error object
|
||||
var error = {
|
||||
message: 'You must be connected to the Internet in order to save to Pocket. Please connect to the Internet and try again.'
|
||||
};
|
||||
pktUIMessaging.sendErrorMessageToPanel(panelId, saveLinkMessageId, error); return;
|
||||
}
|
||||
|
||||
// Add url
|
||||
var options = {
|
||||
success: function(data, request) {
|
||||
@ -361,7 +338,7 @@ var pktUI = (function() {
|
||||
status: "success",
|
||||
item: item
|
||||
};
|
||||
pktUIMessaging.sendMessageToPanel(panelId, saveLinkMessageId, successResponse);
|
||||
sendMessage('saveLink', successResponse);
|
||||
},
|
||||
error: function(error, request) {
|
||||
// If user is not authorized show singup page
|
||||
@ -370,13 +347,8 @@ var pktUI = (function() {
|
||||
return;
|
||||
}
|
||||
|
||||
// If there is no error message in the error use a
|
||||
// complete catch-all
|
||||
var errorMessage = error.message || "There was an error when trying to save to Pocket.";
|
||||
var panelError = { message: errorMessage}
|
||||
|
||||
// Send error message to panel
|
||||
pktUIMessaging.sendErrorMessageToPanel(panelId, saveLinkMessageId, panelError);
|
||||
// Send error message to panel
|
||||
sendErrorMessage('saveLink', error);
|
||||
}
|
||||
}
|
||||
|
||||
@ -389,8 +361,8 @@ var pktUI = (function() {
|
||||
pktApi.addLink(url, options);
|
||||
},
|
||||
onHide: panelDidHide,
|
||||
width: savePanelWidth,
|
||||
height: pktApi.isPremiumUser() && isValidURL ? savePanelHeights.expanded : savePanelHeights.collapsed
|
||||
width: 350,
|
||||
height: 267
|
||||
});
|
||||
}
|
||||
|
||||
@ -398,9 +370,6 @@ var pktUI = (function() {
|
||||
* Open a generic panel
|
||||
*/
|
||||
function showPanel(url, options) {
|
||||
// Add new panel id
|
||||
_panelId += 1;
|
||||
url += ("&panelId=" + _panelId);
|
||||
|
||||
// We don't have to hide and show the panel again if it's already shown
|
||||
// as if the user tries to click again on the toolbar button the overlay
|
||||
@ -420,15 +389,13 @@ var pktUI = (function() {
|
||||
|
||||
// For some reason setting onpopupshown and onpopuphidden on the panel directly didn't work, so
|
||||
// do it this hacky way for now
|
||||
_currentPanelDidShow = options.onShow;
|
||||
_currentPanelDidHide = options.onHide;
|
||||
currentPanelDidShow = options.onShow;
|
||||
currentPanelDidHide = options.onHide;
|
||||
|
||||
resizePanel({
|
||||
width: options.width,
|
||||
height: options.height
|
||||
});
|
||||
|
||||
return _panelId;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -454,132 +421,168 @@ var pktUI = (function() {
|
||||
function panelDidHide() {
|
||||
}
|
||||
|
||||
// -- Communication to Panels -- //
|
||||
// https://developer.mozilla.org/en-US/Add-ons/Code_snippets/Interaction_between_privileged_and_non-privileged_pages
|
||||
|
||||
/**
|
||||
* Register a listener and callback for a specific messageId
|
||||
*/
|
||||
function addMessageListener(messageId, callback) {
|
||||
|
||||
document.addEventListener('PKT_'+messageId, function(e) {
|
||||
// ignore to ensure we do not pick up other events in the browser
|
||||
if (e.target.tagName !== 'PKTMESSAGEFROMPANELELEMENT') {
|
||||
return;
|
||||
}
|
||||
|
||||
// Send payload to callback
|
||||
callback(JSON.parse(e.target.getAttribute("payload"))[0]);
|
||||
|
||||
// Cleanup the element
|
||||
e.target.parentNode.removeChild(e.target);
|
||||
|
||||
}, false, true);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a message listener
|
||||
*/
|
||||
function removeMessageListener(messageId, callback) {
|
||||
document.removeMessageListener('PKT_'+messageId, callback);
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a message to the panel's iframe
|
||||
*/
|
||||
function sendMessage(messageId, payload) {
|
||||
|
||||
var doc = getPanelFrame().contentWindow.document;
|
||||
|
||||
var AnswerEvt = doc.createElement("PKTMessage");
|
||||
AnswerEvt.setAttribute("payload", JSON.stringify([payload]));
|
||||
|
||||
doc.documentElement.appendChild(AnswerEvt);
|
||||
|
||||
var event = doc.createEvent("HTMLEvents");
|
||||
event.initEvent('PKT_'+messageId, true, false);
|
||||
AnswerEvt.dispatchEvent(event);
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function to package an error object and send it to the panel iframe as a message response
|
||||
*/
|
||||
function sendErrorMessage(messageId, error) {
|
||||
var errorResponse = {status: "error", error: error.message};
|
||||
sendMessage(messageId, errorResponse);
|
||||
}
|
||||
|
||||
/**
|
||||
* Register all of the messages needed for the panels
|
||||
*/
|
||||
function registerEventMessages() {
|
||||
|
||||
// TODO : There are likely some possible race conditions possible here, for example if the user clicks the button quickly multiple times, due to the async property of the messages, a message may be picked up for an older panel. We should consider updating this to include some sort of panelId that changes per open.
|
||||
var iframe = getPanelFrame();
|
||||
|
||||
// Only register the messages once
|
||||
var didInitAttributeKey = 'did_init';
|
||||
var didInitMessageListener = iframe.getAttribute(didInitAttributeKey);
|
||||
if (typeof didInitMessageListener !== "undefined" && didInitMessageListener == 1) {
|
||||
return;
|
||||
if (iframe.getAttribute('did_init') == 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
iframe.setAttribute(didInitAttributeKey, 1);
|
||||
iframe.setAttribute('did_init', 1);
|
||||
|
||||
// When the panel is displayed it generated an event called
|
||||
// "show": we will listen for that event and when it happens,
|
||||
// send our own "show" event to the panel's script, so the
|
||||
// script can prepare the panel for display.
|
||||
var _showMessageId = "show";
|
||||
pktUIMessaging.addMessageListener(_showMessageId, function(panelId, data) {
|
||||
addMessageListener("show", function(payload) {
|
||||
// Let panel know that it is ready
|
||||
pktUIMessaging.sendMessageToPanel(panelId, _showMessageId);
|
||||
sendMessage('show');
|
||||
});
|
||||
|
||||
// Open a new tab with a given url and activate if
|
||||
var _openTabWithUrlMessageId = "openTabWithUrl";
|
||||
pktUIMessaging.addMessageListener(_openTabWithUrlMessageId, function(panelId, data) {
|
||||
|
||||
// Check if the tab should become active after opening
|
||||
// Open a new tab with a given url and activate if
|
||||
addMessageListener("openTabWithUrl", function(payload) {
|
||||
var activate = true;
|
||||
if (typeof data.activate !== "undefined") {
|
||||
activate = data.activate;
|
||||
if (typeof payload.activate !== "undefined") {
|
||||
activate = payload.activate;
|
||||
}
|
||||
|
||||
var url = data.url;
|
||||
openTabWithUrl(url, activate);
|
||||
pktUIMessaging.sendResponseMessageToPanel(panelId, _openTabWithUrlMessageId, url);
|
||||
openTabWithUrl(payload.url, activate);
|
||||
sendMessage("openTabWithUrlResponse", payload.url);
|
||||
});
|
||||
|
||||
// Close the panel
|
||||
var _closeMessageId = "close";
|
||||
pktUIMessaging.addMessageListener(_closeMessageId, function(panelId, data) {
|
||||
addMessageListener("close", function(payload) {
|
||||
getPanel().hidePopup();
|
||||
});
|
||||
|
||||
// Send the current url to the panel
|
||||
var _getCurrentURLMessageId = "getCurrentURL";
|
||||
pktUIMessaging.addMessageListener(_getCurrentURLMessageId, function(panelId, data) {
|
||||
pktUIMessaging.sendResponseMessageToPanel(panelId, _getCurrentURLMessageId, getCurrentUrl());
|
||||
addMessageListener("getCurrentURL", function(payload) {
|
||||
sendMessage('getCurrentURLResponse', getCurrentUrl());
|
||||
});
|
||||
|
||||
var _resizePanelMessageId = "resizePanel";
|
||||
pktUIMessaging.addMessageListener(_resizePanelMessageId, function(panelId, data) {
|
||||
resizePanel(data);
|
||||
});
|
||||
|
||||
// Callback post initialization to tell background script that panel is "ready" for communication.
|
||||
pktUIMessaging.addMessageListener("listenerReady", function(panelId, data) {
|
||||
|
||||
});
|
||||
|
||||
pktUIMessaging.addMessageListener("collapseSavePanel", function(panelId, data) {
|
||||
if (!pktApi.isPremiumUser())
|
||||
resizePanel({width:savePanelWidth, height:savePanelHeights.collapsed});
|
||||
addMessageListener("listenerReady", function(payload) {
|
||||
});
|
||||
|
||||
pktUIMessaging.addMessageListener("expandSavePanel", function(panelId, data) {
|
||||
resizePanel({width:savePanelWidth, height:savePanelHeights.expanded});
|
||||
addMessageListener("resizePanel", function(payload) {
|
||||
resizePanel(payload);
|
||||
});
|
||||
|
||||
// Ask for recently accessed/used tags for auto complete
|
||||
var _getTagsMessageId = "getTags";
|
||||
pktUIMessaging.addMessageListener(_getTagsMessageId, function(panelId, data) {
|
||||
addMessageListener("getTags", function(payload) {
|
||||
pktApi.getTags(function(tags, usedTags) {
|
||||
pktUIMessaging.sendResponseMessageToPanel(panelId, _getTagsMessageId, {
|
||||
tags: tags,
|
||||
usedTags: usedTags
|
||||
});
|
||||
sendMessage('getTagsResponse', {tags, usedTags});
|
||||
});
|
||||
});
|
||||
|
||||
// Ask for suggested tags based on passed url
|
||||
var _getSuggestedTagsMessageId = "getSuggestedTags";
|
||||
pktUIMessaging.addMessageListener(_getSuggestedTagsMessageId, function(panelId, data) {
|
||||
pktApi.getSuggestedTagsForURL(data.url, {
|
||||
addMessageListener("getSuggestedTags", function(payload) {
|
||||
var responseMessageId = "getSuggestedTagsResponse";
|
||||
|
||||
pktApi.getSuggestedTagsForURL(payload.url, {
|
||||
success: function(data, response) {
|
||||
var suggestedTags = data.suggested_tags;
|
||||
var successResponse = {
|
||||
status: "success",
|
||||
value: {
|
||||
suggestedTags : suggestedTags
|
||||
"suggestedTags" : suggestedTags
|
||||
}
|
||||
}
|
||||
pktUIMessaging.sendResponseMessageToPanel(panelId, _getSuggestedTagsMessageId, successResponse);
|
||||
sendMessage(responseMessageId, successResponse);
|
||||
},
|
||||
error: function(error, response) {
|
||||
pktUIMessaging.sendErrorResponseMessageToPanel(panelId, _getSuggestedTagsMessageId, error);
|
||||
sendErrorMessage(responseMessageId, error);
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
// Pass url and array list of tags, add to existing save item accordingly
|
||||
var _addTagsMessageId = "addTags";
|
||||
pktUIMessaging.addMessageListener(_addTagsMessageId, function(panelId, data) {
|
||||
pktApi.addTagsToURL(data.url, data.tags, {
|
||||
addMessageListener("addTags", function(payload) {
|
||||
var responseMessageId = "addTagsResponse";
|
||||
|
||||
pktApi.addTagsToURL(payload.url, payload.tags, {
|
||||
success: function(data, response) {
|
||||
var successResponse = {status: "success"};
|
||||
pktUIMessaging.sendResponseMessageToPanel(panelId, _addTagsMessageId, successResponse);
|
||||
var successResponse = {status: "success"};
|
||||
sendMessage(responseMessageId, successResponse);
|
||||
},
|
||||
error: function(error, response) {
|
||||
pktUIMessaging.sendErrorResponseMessageToPanel(panelId, _addTagsMessageId, error);
|
||||
sendErrorMessage(responseMessageId, error);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// Based on clicking "remove page" CTA, and passed unique item id, remove the item
|
||||
var _deleteItemMessageId = "deleteItem";
|
||||
pktUIMessaging.addMessageListener(_deleteItemMessageId, function(panelId, data) {
|
||||
pktApi.deleteItem(data.itemId, {
|
||||
addMessageListener("deleteItem", function(payload) {
|
||||
var responseMessageId = "deleteItemResponse";
|
||||
|
||||
pktApi.deleteItem(payload.itemId, {
|
||||
success: function(data, response) {
|
||||
var successResponse = {status: "success"};
|
||||
pktUIMessaging.sendResponseMessageToPanel(panelId, _deleteItemMessageId, successResponse);
|
||||
var successResponse = {status: "success"};
|
||||
sendMessage(responseMessageId, successResponse);
|
||||
},
|
||||
error: function(error, response) {
|
||||
pktUIMessaging.sendErrorResponseMessageToPanel(panelId, _deleteItemMessageId, error);
|
||||
sendErrorMessage(responseMessageId, error);
|
||||
}
|
||||
})
|
||||
});
|
||||
@ -745,149 +748,3 @@ var pktUI = (function() {
|
||||
isHidden
|
||||
};
|
||||
}());
|
||||
|
||||
// -- Communication to Background -- //
|
||||
// https://developer.mozilla.org/en-US/Add-ons/Code_snippets/Interaction_between_privileged_and_non-privileged_pages
|
||||
var pktUIMessaging = (function() {
|
||||
|
||||
/**
|
||||
* Prefix message id for message listening
|
||||
*/
|
||||
function prefixedMessageId(messageId) {
|
||||
return 'PKT_' + messageId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Register a listener and callback for a specific messageId
|
||||
*/
|
||||
function addMessageListener(messageId, callback) {
|
||||
document.addEventListener(prefixedMessageId(messageId), function(e) {
|
||||
// ignore to ensure we do not pick up other events in the browser
|
||||
if (e.target.tagName !== 'PKTMESSAGEFROMPANELELEMENT') {
|
||||
return;
|
||||
}
|
||||
|
||||
// Pass in information to callback
|
||||
var payload = JSON.parse(e.target.getAttribute("payload"))[0];
|
||||
var panelId = payload.panelId;
|
||||
var data = payload.data;
|
||||
callback(panelId, data);
|
||||
|
||||
// Cleanup the element
|
||||
e.target.parentNode.removeChild(e.target);
|
||||
|
||||
}, false, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a message listener
|
||||
*/
|
||||
function removeMessageListener(messageId, callback) {
|
||||
document.removeEventListener(prefixedMessageId(messageId), callback);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Send a message to the panel's iframe
|
||||
*/
|
||||
function sendMessageToPanel(panelId, messageId, payload) {
|
||||
|
||||
if (!isPanelIdValid(panelId)) { return; };
|
||||
|
||||
var panelFrame = document.getElementById('pocket-panel-iframe');
|
||||
if (!isPocketPanelFrameValid(panelFrame)) { return; }
|
||||
|
||||
var doc = panelFrame.contentWindow.document;
|
||||
var documentElement = doc.documentElement;
|
||||
|
||||
// Send message to panel
|
||||
var panelMessageId = prefixedMessageId(panelId + '_' + messageId);
|
||||
|
||||
var AnswerEvt = doc.createElement("PKTMessage");
|
||||
AnswerEvt.setAttribute("payload", JSON.stringify([payload]));
|
||||
documentElement.appendChild(AnswerEvt);
|
||||
|
||||
var event = doc.createEvent("HTMLEvents");
|
||||
event.initEvent(panelMessageId, true, false);
|
||||
AnswerEvt.dispatchEvent(event);
|
||||
}
|
||||
|
||||
function sendResponseMessageToPanel(panelId, messageId, payload) {
|
||||
var responseMessageId = messageId + "Response";
|
||||
sendMessageToPanel(panelId, responseMessageId, payload);
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function to package an error object and send it to the panel
|
||||
* iframe as a message response
|
||||
*/
|
||||
function sendErrorMessageToPanel(panelId, messageId, error) {
|
||||
var errorResponse = {status: "error", error: error};
|
||||
sendMessageToPanel(panelId, messageId, errorResponse);
|
||||
}
|
||||
|
||||
function sendErrorResponseMessageToPanel(panelId, messageId, error) {
|
||||
var errorResponse = {status: "error", error: error};
|
||||
sendResponseMessageToPanel(panelId, messageId, errorResponse);
|
||||
}
|
||||
|
||||
/**
|
||||
* Validation
|
||||
*/
|
||||
|
||||
function isPanelIdValid(panelId) {
|
||||
// First check if panelId has a valid value > 0. We set the panelId to
|
||||
// 0 to start. But if for some reason the message is attempted to be
|
||||
// sent before the panel has a panelId, then it's going to send out
|
||||
// a message with panelId 0, which is never going to be heard. If this
|
||||
// happens, it means some race condition occurred where the panel was
|
||||
// trying to communicate before it should.
|
||||
if (panelId === 0) {
|
||||
console.warn("Tried to send message to panel with id 0.")
|
||||
return false;
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
function isPocketPanelFrameValid(panelFrame) {
|
||||
// Check if panel is available if not throw a warning and bailout.
|
||||
// We likely try to send to a panel that is not visible anymore
|
||||
if (typeof panelFrame === "undefined") {
|
||||
console.warn("Pocket panel frame is undefined");
|
||||
return false;
|
||||
}
|
||||
|
||||
var contentWindow = panelFrame.contentWindow;
|
||||
if (typeof contentWindow == "undefined") {
|
||||
console.warn("Pocket panel frame content window is undefined");
|
||||
return false;
|
||||
}
|
||||
|
||||
var doc = contentWindow.document;
|
||||
if (typeof doc === "undefined") {
|
||||
console.warn("Pocket panel frame content window document is undefined");
|
||||
return false;
|
||||
}
|
||||
|
||||
var documentElement = doc.documentElement;
|
||||
if (typeof documentElement === "undefined") {
|
||||
console.warn("Pocket panel frame content window document document element is undefined");
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Public
|
||||
*/
|
||||
return {
|
||||
addMessageListener: addMessageListener,
|
||||
removeMessageListener: removeMessageListener,
|
||||
sendMessageToPanel: sendMessageToPanel,
|
||||
sendResponseMessageToPanel: sendResponseMessageToPanel,
|
||||
sendErrorMessageToPanel: sendErrorMessageToPanel,
|
||||
sendErrorResponseMessageToPanel: sendErrorResponseMessageToPanel
|
||||
}
|
||||
}());
|
||||
|
||||
@ -397,28 +397,3 @@ td,
|
||||
th {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* Normalization for FF panel defauts
|
||||
========================================================================== */
|
||||
html {
|
||||
outline: none;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
a {
|
||||
color: #0095dd;
|
||||
margin: 0;
|
||||
outline: none;
|
||||
padding: 0;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a:hover,
|
||||
a:active {
|
||||
color: #008acb;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
a:active {
|
||||
color: #006b9d;
|
||||
}
|
||||
|
||||
@ -52,15 +52,12 @@
|
||||
.pkt_ext_containersaved .pkt_ext_loadingspinner {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 2.5em;
|
||||
height: 2.5em;
|
||||
left: 50%;
|
||||
margin: 2em 0 0 -1.25em;
|
||||
margin: 2em 0 0;
|
||||
font-size: 10px;
|
||||
text-indent: 999em;
|
||||
position: absolute;
|
||||
top: 4em;
|
||||
overflow: hidden;
|
||||
width: 2.5em;
|
||||
animation: pkt_ext_spin 0.7s infinite steps(8);
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_loadingspinner:before,
|
||||
@ -99,7 +96,7 @@
|
||||
.pkt_ext_containersaved .pkt_ext_initload {
|
||||
left: 0;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
top: 1em;
|
||||
width: 100%;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_detail {
|
||||
@ -109,6 +106,7 @@
|
||||
z-index: 10;
|
||||
}
|
||||
.pkt_ext_container_detailactive .pkt_ext_initload {
|
||||
transition: opacity 0.2s ease-out;
|
||||
opacity: 0;
|
||||
}
|
||||
.pkt_ext_container_detailactive .pkt_ext_initload .pkt_ext_loadingspinner,
|
||||
@ -118,6 +116,7 @@
|
||||
.pkt_ext_container_detailactive .pkt_ext_detail {
|
||||
max-height: 20em;
|
||||
opacity: 1;
|
||||
transition: opacity 0.2s ease-out;
|
||||
}
|
||||
.pkt_ext_container_finalstate .pkt_ext_edit_msg,
|
||||
.pkt_ext_container_finalstate .pkt_ext_tag_detail,
|
||||
@ -152,9 +151,30 @@
|
||||
@keyframes fade_in_out {
|
||||
0% {
|
||||
opacity: 1;
|
||||
top: 0;
|
||||
}
|
||||
50% {
|
||||
opacity: 0;
|
||||
top: 0;
|
||||
}
|
||||
51% {
|
||||
opacity: 0;
|
||||
top: 10px;
|
||||
}
|
||||
100% {
|
||||
opacity: 1;
|
||||
top: 10px;
|
||||
}
|
||||
}
|
||||
@keyframes fade_in_outalt {
|
||||
0% {
|
||||
opacity: 1;
|
||||
}
|
||||
50% {
|
||||
opacity: 0;
|
||||
}
|
||||
51% {
|
||||
opacity: 0;
|
||||
}
|
||||
100% {
|
||||
opacity: 1;
|
||||
@ -162,17 +182,18 @@
|
||||
}
|
||||
.pkt_ext_container_finalstate h2 {
|
||||
animation: fade_in_out 0.4s ease-out;
|
||||
top: 10px;
|
||||
}
|
||||
.pkt_ext_container_finalerrorstate h2 {
|
||||
animation: none;
|
||||
animation: fade_int_outalt 0.4s ease-out;
|
||||
color: #d74345;
|
||||
top: 0;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_errordetail {
|
||||
display: none;
|
||||
font-size: 12px;
|
||||
font-weight: normal;
|
||||
left: 6.4em;
|
||||
max-width: 21em;
|
||||
opacity: 0;
|
||||
position: absolute;
|
||||
top: 2.7em;
|
||||
@ -199,33 +220,20 @@
|
||||
background-size: 44px 40px;
|
||||
}
|
||||
}
|
||||
.pkt_ext_container_finalerrorstate .pkt_ext_logo {
|
||||
background-image: url(../img/pocketerror@1x.png);
|
||||
height: 44px;
|
||||
width: 44px;
|
||||
}
|
||||
@media (min-resolution: 1.1dppx) {
|
||||
.pkt_ext_container_finalerrorstate .pkt_ext_logo {
|
||||
background-image: url(../img/pocketerror@2x.png);
|
||||
background-size: 44px 44px;
|
||||
}
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_topdetail {
|
||||
float: left;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_edit_msg {
|
||||
box-sizing: border-box;
|
||||
display: none;
|
||||
font-size: 0.75em;
|
||||
font-size: 0.875em;
|
||||
left: auto;
|
||||
padding: 0 1.4em;
|
||||
position: absolute;
|
||||
text-align: left;
|
||||
top: 8.7em;
|
||||
text-align: center;
|
||||
top: 4.3em;
|
||||
width: 100%;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_edit_msg_error {
|
||||
color: #d74345;
|
||||
color: #c10000;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_edit_msg_active {
|
||||
display: block;
|
||||
@ -349,9 +357,6 @@
|
||||
padding: 0;
|
||||
display: flex;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_tag_error {
|
||||
border: none;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_tag_input_wrapper {
|
||||
box-sizing: border-box;
|
||||
flex: 1;
|
||||
@ -369,9 +374,6 @@
|
||||
padding-left: 0.5em;
|
||||
padding-right: 0.5em;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_tag_error .pkt_ext_tag_input_wrapper {
|
||||
border: 1px solid #d74345;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_tag_input_wrapper .token-input-list {
|
||||
display: block;
|
||||
left: 0;
|
||||
@ -416,7 +418,6 @@
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_btn {
|
||||
box-sizing: border-box;
|
||||
color: #333;
|
||||
float: none;
|
||||
font-size: 0.875em;
|
||||
font-size: 14px;
|
||||
@ -424,27 +425,13 @@
|
||||
height: 2.2em;
|
||||
min-width: 4em;
|
||||
padding: 0.5em 0;
|
||||
text-decoration: none;
|
||||
text-transform: none;
|
||||
width: auto;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_btn:hover {
|
||||
background-color: #ebebeb;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_btn:active {
|
||||
background-color: #dadada;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_btn_disabled,
|
||||
.pkt_ext_containersaved .pkt_ext_btn_disabled:hover,
|
||||
.pkt_ext_containersaved .pkt_ext_btn_disabled:active {
|
||||
background-color: transparent;
|
||||
.pkt_ext_containersaved .pkt_ext_btn_disabled {
|
||||
background-color: #ededed;
|
||||
cursor: default;
|
||||
opacity: 0.4;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_tag_error .pkt_ext_btn {
|
||||
border: 1px solid #c3c3c3;
|
||||
border-width: 1px 1px 1px 0;
|
||||
height: 2.35em;
|
||||
opacity: 0.5;
|
||||
}
|
||||
.pkt_ext_containersaved .autocomplete-suggestions {
|
||||
margin-top: 2.2em;
|
||||
@ -452,27 +439,19 @@
|
||||
|
||||
/*=Recent/suggested tags
|
||||
--------------------------------------------------------------------------------------- */
|
||||
.pkt_ext_containersaved .pkt_ext_suggestedtag_detail,
|
||||
.pkt_ext_containersaved .pkt_ext_suggestedtag_detailshown {
|
||||
.pkt_ext_containersaved .pkt_ext_suggestedtag_detail {
|
||||
border-top: 1px solid #c1c1c1;
|
||||
bottom: 0;
|
||||
background: #ebebeb;
|
||||
clear: both;
|
||||
left: 0;
|
||||
opacity: 0;
|
||||
min-height: 110px;
|
||||
position: fixed;
|
||||
visibility: hidden;
|
||||
width: 100%;
|
||||
min-height: 110px;
|
||||
}
|
||||
.pkt_ext_container_detailactive .pkt_ext_suggestedtag_detail,
|
||||
.pkt_ext_containersaved .pkt_ext_suggestedtag_detailshown {
|
||||
.pkt_ext_container_detailactive .pkt_ext_suggestedtag_detail {
|
||||
opacity: 1;
|
||||
transition: opacity 0.2s ease-out, visibility 0.2s ease-out;
|
||||
visibility: visible;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_suggestedtag_detailshown {
|
||||
padding: 4px 0;
|
||||
}
|
||||
.pkt_ext_container_finalstate .pkt_ext_suggestedtag_detail {
|
||||
opacity: 0;
|
||||
visibility: hidden;
|
||||
@ -509,11 +488,6 @@
|
||||
overflow: hidden;
|
||||
padding: 2px 0 0 0;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_suggestedtag_detail ul {
|
||||
height: auto;
|
||||
margin: 0 2em 0 0;
|
||||
padding-top: 6px;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_recenttag_detail li,
|
||||
.pkt_ext_containersaved .pkt_ext_suggestedtag_detail li {
|
||||
background: none;
|
||||
@ -538,9 +512,6 @@
|
||||
text-align: left;
|
||||
top: 2em;
|
||||
}
|
||||
.pkt_ext_containersaved .pkt_ext_suggestedtag_detail .suggestedtag_msg {
|
||||
margin-right: 1.3em;
|
||||
}
|
||||
.pkt_ext_containersaved .token_tag {
|
||||
border-radius: 4px;
|
||||
background: #f7f7f7;
|
||||
@ -551,7 +522,7 @@
|
||||
font-weight: normal;
|
||||
letter-spacing: normal;
|
||||
margin-right: 0.5em;
|
||||
padding: 0.125em 0.625em;
|
||||
padding: 0.125em 0.3125em;
|
||||
text-decoration: none;
|
||||
text-transform: none;
|
||||
}
|
||||
@ -668,7 +639,7 @@
|
||||
border: 1px solid #c3c3c3;
|
||||
overflow: hidden;
|
||||
margin: 0;
|
||||
padding: 0 8px;
|
||||
padding: 0 5px;
|
||||
background-color: #f7f7f7;
|
||||
color: #000;
|
||||
font-weight: normal;
|
||||
@ -717,7 +688,7 @@
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
height: 8px;
|
||||
margin: 0 0 0 8px;
|
||||
margin: 0 2px 0 8px;
|
||||
overflow: hidden;
|
||||
width: 8px;
|
||||
text-indent: -99px;
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 21 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 66 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 40 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 145 KiB After Width: | Height: | Size: 130 KiB |
@ -3,12 +3,10 @@ Translations.en =
|
||||
{
|
||||
addtags: "Add Tags",
|
||||
alreadyhaveacct: "Already a Pocket user?",
|
||||
errorgeneric: "There was an error when trying to save to Pocket.",
|
||||
learnmore: "Learn More",
|
||||
loginnow: "Log in",
|
||||
maxtaglength: "Tags are limited to 25 characters",
|
||||
mustbeconnected: "You must be connected to the Internet in order to save to Pocket. Please check your connection and try again.",
|
||||
onlylinkssaved: "Only links can be saved",
|
||||
or: "or",
|
||||
pagenotsaved: "Page Not Saved",
|
||||
pageremoved: "Page Removed",
|
||||
pagesaved: "Saved to Pocket",
|
||||
@ -16,7 +14,6 @@ Translations.en =
|
||||
processingtags: "Adding tags...",
|
||||
removepage: "Remove Page",
|
||||
save: "Save",
|
||||
saving: "Saving...",
|
||||
signupemail: "Sign up with email",
|
||||
signuptosave: "Sign up for Pocket. It’s free.",
|
||||
suggestedtags: "Suggested Tags",
|
||||
|
||||
@ -1,27 +1,11 @@
|
||||
// Documentation of methods used here are at:
|
||||
// https://developer.mozilla.org/en-US/Add-ons/Code_snippets/Interaction_between_privileged_and_non-privileged_pages
|
||||
|
||||
var pktPanelMessaging = (function() {
|
||||
var Messaging = (function() {
|
||||
|
||||
function panelIdFromURL(url) {
|
||||
var panelId = url.match(/panelId=([\w|\d|\.]*)&?/);
|
||||
if (panelId && panelId.length > 1) {
|
||||
return panelId[1];
|
||||
}
|
||||
function addMessageListener(messageId, callback) {
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
function prefixedMessageId(messageId) {
|
||||
return 'PKT_' + messageId;
|
||||
}
|
||||
|
||||
function panelPrefixedMessageId(panelId, messageId) {
|
||||
return prefixedMessageId(panelId + '_' + messageId);
|
||||
}
|
||||
|
||||
function addMessageListener(panelId, messageId, callback) {
|
||||
document.addEventListener(panelPrefixedMessageId(panelId, messageId), function(e) {
|
||||
document.addEventListener('PKT_' + messageId, function(e) {
|
||||
|
||||
callback(JSON.parse(e.target.getAttribute("payload"))[0]);
|
||||
|
||||
@ -32,36 +16,33 @@ var pktPanelMessaging = (function() {
|
||||
|
||||
}
|
||||
|
||||
function removeMessageListener(panelId, messageId, callback) {
|
||||
document.removeEventListener(panelPrefixedMessageId(panelId, messageId), callback);
|
||||
function removeMessageListener(messageId, callback) {
|
||||
|
||||
document.removeEventListener('PKT_' + messageId, callback);
|
||||
|
||||
}
|
||||
|
||||
function sendMessage(panelId, messageId, payload, callback) {
|
||||
// Payload needs to be an object in format:
|
||||
// { panelId: panelId, data: {} }
|
||||
var messagePayload = {
|
||||
panelId: panelId,
|
||||
data: (payload || {})
|
||||
};
|
||||
function sendMessage(messageId, payload, callback) {
|
||||
|
||||
// Create a callback to listen for a response
|
||||
if (callback) {
|
||||
// Message response id is messageId + "Response"
|
||||
var messageResponseId = messageId + "Response";
|
||||
var responseListener = function(responsePayload) {
|
||||
callback(responsePayload);
|
||||
removeMessageListener(panelId, messageResponseId, responseListener);
|
||||
removeMessageListener(messageResponseId, responseListener);
|
||||
}
|
||||
|
||||
addMessageListener(panelId, messageResponseId, responseListener);
|
||||
addMessageListener(messageResponseId, responseListener);
|
||||
}
|
||||
|
||||
// Send message
|
||||
var element = document.createElement("PKTMessageFromPanelElement");
|
||||
element.setAttribute("payload", JSON.stringify([messagePayload]));
|
||||
element.setAttribute("payload", JSON.stringify([payload]));
|
||||
document.documentElement.appendChild(element);
|
||||
|
||||
var evt = document.createEvent("Events");
|
||||
evt.initEvent(prefixedMessageId(messageId), true, false);
|
||||
evt.initEvent('PKT_'+messageId, true, false);
|
||||
element.dispatchEvent(evt);
|
||||
}
|
||||
|
||||
@ -70,7 +51,6 @@ var pktPanelMessaging = (function() {
|
||||
* Public functions
|
||||
*/
|
||||
return {
|
||||
panelIdFromURL: panelIdFromURL,
|
||||
addMessageListener : addMessageListener,
|
||||
removeMessageListener : removeMessageListener,
|
||||
sendMessage: sendMessage
|
||||
|
||||
@ -11,7 +11,6 @@ var PKT_SAVED_OVERLAY = function (options)
|
||||
this.savedItemId = 0;
|
||||
this.savedUrl = '';
|
||||
this.premiumStatus = false;
|
||||
this.panelId = 0;
|
||||
this.preventCloseTimerCancel = false;
|
||||
this.closeValid = true;
|
||||
this.mouseInside = false;
|
||||
@ -34,8 +33,14 @@ var PKT_SAVED_OVERLAY = function (options)
|
||||
var newtag = $('<li><a href="#" class="token_tag ' + tagclass + '">' + tags[i] + '</a></li>');
|
||||
container.append(newtag);
|
||||
var templeft = newtag.position().left;
|
||||
this.cxt_suggested_available++;
|
||||
newtagleft = templeft;
|
||||
if (templeft > newtagleft) {
|
||||
this.cxt_suggested_available++;
|
||||
newtagleft = templeft;
|
||||
}
|
||||
else {
|
||||
newtag.remove();
|
||||
break;
|
||||
}
|
||||
}
|
||||
};
|
||||
this.fillUserTags = function() {
|
||||
@ -185,6 +190,9 @@ var PKT_SAVED_OVERLAY = function (options)
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
returnlist.push({name:'blah'});
|
||||
}
|
||||
if (!$('.token-input-dropdown-tag').data('init')) {
|
||||
$('.token-input-dropdown-tag').css('width',inputwrapper.outerWidth()).data('init');
|
||||
inputwrapper.append($('.token-input-dropdown-tag'));
|
||||
@ -194,7 +202,7 @@ var PKT_SAVED_OVERLAY = function (options)
|
||||
textToData: function(text) {
|
||||
if($.trim(text).length > 25 || !$.trim(text).length) {
|
||||
if (text.length > 25) {
|
||||
myself.showTagsError(myself.dictJSON.maxtaglength);
|
||||
$('.pkt_ext_edit_msg').addClass('pkt_ext_edit_msg_error pkt_ext_edit_msg_active').text(myself.dictJSON.invalidTags);
|
||||
changestamp = Date.now();
|
||||
setTimeout(function() {
|
||||
$('.token-input-input-token input').val(text).focus();
|
||||
@ -203,7 +211,7 @@ var PKT_SAVED_OVERLAY = function (options)
|
||||
return null;
|
||||
}
|
||||
else {
|
||||
myself.hideTagsError();
|
||||
$('.pkt_ext_edit_msg').removeClass('pkt_ext_edit_msg_error pkt_ext_edit_msg_active').text('');
|
||||
return {name:myself.sanitizeText(text.toLowerCase())};
|
||||
}
|
||||
},
|
||||
@ -250,12 +258,6 @@ var PKT_SAVED_OVERLAY = function (options)
|
||||
changestamp = Date.now();
|
||||
myself.showActiveTags();
|
||||
myself.checkPlaceholderStatus();
|
||||
},
|
||||
onShowDropdown: function() {
|
||||
thePKT_SAVED.sendMessage("expandSavePanel");
|
||||
},
|
||||
onHideDropdown: function() {
|
||||
thePKT_SAVED.sendMessage("collapseSavePanel");
|
||||
}
|
||||
});
|
||||
$('body').on('keydown',function(e) {
|
||||
@ -362,14 +364,6 @@ var PKT_SAVED_OVERLAY = function (options)
|
||||
myself.closePopup();
|
||||
});
|
||||
};
|
||||
this.showTagsError = function(msg) {
|
||||
$('.pkt_ext_edit_msg').addClass('pkt_ext_edit_msg_error pkt_ext_edit_msg_active').text(msg);
|
||||
$('.pkt_ext_tag_detail').addClass('pkt_ext_tag_error');
|
||||
};
|
||||
this.hideTagsError = function(msg) {
|
||||
$('.pkt_ext_edit_msg').removeClass('pkt_ext_edit_msg_error pkt_ext_edit_msg_active').text('');
|
||||
$('.pkt_ext_tag_detail').removeClass('pkt_ext_tag_error');
|
||||
};
|
||||
this.showActiveTags = function() {
|
||||
if (!$('.pkt_ext_suggestedtag_detail').length) {
|
||||
return;
|
||||
@ -573,7 +567,6 @@ PKT_SAVED_OVERLAY.prototype = {
|
||||
if (this.premiumStatus && !$('.pkt_ext_suggestedtag_detail').length)
|
||||
{
|
||||
$('body').append(Handlebars.templates.saved_premiumshell(this.dictJSON));
|
||||
$('.pkt_ext_initload').append(Handlebars.templates.saved_premiumextras(this.dictJSON));
|
||||
}
|
||||
}
|
||||
};
|
||||
@ -593,11 +586,11 @@ PKT_SAVED.prototype = {
|
||||
},
|
||||
|
||||
addMessageListener: function(messageId, callback) {
|
||||
pktPanelMessaging.addMessageListener(this.overlay.panelId, messageId, callback);
|
||||
Messaging.addMessageListener(messageId, callback);
|
||||
},
|
||||
|
||||
sendMessage: function(messageId, payload, callback) {
|
||||
pktPanelMessaging.sendMessage(this.overlay.panelId, messageId, payload, callback);
|
||||
Messaging.sendMessage(messageId, payload, callback);
|
||||
},
|
||||
|
||||
create: function() {
|
||||
@ -612,9 +605,6 @@ PKT_SAVED.prototype = {
|
||||
{
|
||||
myself.overlay.pockethost = host[1];
|
||||
}
|
||||
|
||||
myself.overlay.panelId = pktPanelMessaging.panelIdFromURL(window.location.href);
|
||||
|
||||
myself.overlay.create();
|
||||
|
||||
// tell back end we're ready
|
||||
@ -624,21 +614,7 @@ PKT_SAVED.prototype = {
|
||||
thePKT_SAVED.addMessageListener("saveLink",function(resp)
|
||||
{
|
||||
if (resp.status == 'error') {
|
||||
if (typeof resp.error == 'object')
|
||||
{
|
||||
if (resp.error.localizedKey)
|
||||
{
|
||||
myself.overlay.showStateError(myself.overlay.dictJSON.pagenotsaved,myself.overlay.dictJSON[resp.error.localizedKey]);
|
||||
}
|
||||
else
|
||||
{
|
||||
myself.overlay.showStateError(myself.overlay.dictJSON.pagenotsaved,resp.error.message);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
myself.overlay.showStateError(myself.overlay.dictJSON.pagenotsaved,myself.overlay.dictJSON.errorgeneric);
|
||||
}
|
||||
myself.overlay.showStateError(myself.overlay.dictJSON.pagenotsaved,myself.overlay.dictJSON.onlylinkssaved);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -22,7 +22,6 @@ var PKT_SIGNUP_OVERLAY = function (options)
|
||||
this.variant = "";
|
||||
this.pockethost = "getpocket.com";
|
||||
this.fxasignedin = false;
|
||||
this.panelId = 0;
|
||||
this.dictJSON = {};
|
||||
this.initCloseTabEvents = function() {
|
||||
$('.btn,.pkt_ext_learnmore,.alreadyhave > a').click(function(e)
|
||||
@ -163,8 +162,6 @@ PKT_SIGNUP_OVERLAY.prototype = {
|
||||
this.pockethost = host[1];
|
||||
}
|
||||
|
||||
this.panelId = pktPanelMessaging.panelIdFromURL(window.location.href);
|
||||
|
||||
if (this.active)
|
||||
{
|
||||
return;
|
||||
@ -210,11 +207,11 @@ PKT_SIGNUP.prototype = {
|
||||
},
|
||||
|
||||
addMessageListener: function(messageId, callback) {
|
||||
pktPanelMessaging.addMessageListener(this.overlay.panelId, messageId, callback);
|
||||
Messaging.addMessageListener(messageId, callback);
|
||||
},
|
||||
|
||||
sendMessage: function(messageId, payload, callback) {
|
||||
pktPanelMessaging.sendMessage(this.overlay.panelId, messageId, payload, callback);
|
||||
Messaging.sendMessage(messageId, payload, callback);
|
||||
},
|
||||
|
||||
create: function() {
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
(function() {
|
||||
var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
|
||||
templates['saved_premiumextras'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
|
||||
return "<div class=\"pkt_ext_suggestedtag_detailshown\">\n</div>";
|
||||
},"useData":true});
|
||||
templates['saved_premiumshell'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
|
||||
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
|
||||
return "<div class=\"pkt_ext_suggestedtag_detail pkt_ext_suggestedtag_detail_loading\">\n <h4>"
|
||||
@ -11,21 +8,19 @@ templates['saved_premiumshell'] = template({"compiler":[6,">= 2.0.0-beta.1"],"ma
|
||||
},"useData":true});
|
||||
templates['saved_shell'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
|
||||
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
|
||||
return "<div class=\"pkt_ext_initload\">\n <div class=\"pkt_ext_logo\"></div> \n <div class=\"pkt_ext_topdetail\">\n <h2>"
|
||||
+ escapeExpression(((helper = (helper = helpers.saving || (depth0 != null ? depth0.saving : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"saving","hash":{},"data":data}) : helper)))
|
||||
+ "</h2>\n </div> \n <div class=\"pkt_ext_loadingspinner\"><div></div></div>\n</div> \n<div class=\"pkt_ext_detail\"> \n <div class=\"pkt_ext_logo\"></div>\n <div class=\"pkt_ext_topdetail\">\n <h2>"
|
||||
return "<div class=\"pkt_ext_initload\"> \n <div class=\"pkt_ext_loadingspinner\"><div></div></div>\n</div> \n<div class=\"pkt_ext_detail\"> \n <div class=\"pkt_ext_logo\"></div>\n <div class=\"pkt_ext_topdetail\">\n <h2>"
|
||||
+ escapeExpression(((helper = (helper = helpers.pagesaved || (depth0 != null ? depth0.pagesaved : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pagesaved","hash":{},"data":data}) : helper)))
|
||||
+ "</h2>\n <h3 class=\"pkt_ext_errordetail\"></h3>\n <nav class=\"pkt_ext_item_actions pkt_ext_cf\">\n <ul>\n <li><a class=\"pkt_ext_removeitem\" href=\"#\">"
|
||||
+ escapeExpression(((helper = (helper = helpers.removepage || (depth0 != null ? depth0.removepage : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"removepage","hash":{},"data":data}) : helper)))
|
||||
+ "</a></li>\n <li class=\"pkt_ext_actions_separator\"></li> \n <li><a class=\"pkt_ext_openpocket\" href=\"https://"
|
||||
+ "</a></li>\n <li class=\"pkt_ext_actions_separator\"></li> \n <li><a class=\"pkt_ext_openpocket\" href=\"http://"
|
||||
+ escapeExpression(((helper = (helper = helpers.pockethost || (depth0 != null ? depth0.pockethost : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"pockethost","hash":{},"data":data}) : helper)))
|
||||
+ "/a?src=ff_ext_saved\" target=\"_blank\">"
|
||||
+ escapeExpression(((helper = (helper = helpers.viewlist || (depth0 != null ? depth0.viewlist : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"viewlist","hash":{},"data":data}) : helper)))
|
||||
+ "</a></li>\n </ul>\n </nav> \n </div>\n <div class=\"pkt_ext_tag_detail pkt_ext_cf\">\n <div class=\"pkt_ext_tag_input_wrapper\">\n <div class=\"pkt_ext_tag_input_blocker\"></div>\n <input class=\"pkt_ext_tag_input\" type=\"text\" placeholder=\""
|
||||
+ "</a></li>\n </ul>\n </nav> \n </div>\n <p class=\"pkt_ext_edit_msg\"></p> \n <div class=\"pkt_ext_tag_detail pkt_ext_cf\">\n <div class=\"pkt_ext_tag_input_wrapper\">\n <div class=\"pkt_ext_tag_input_blocker\"></div>\n <input class=\"pkt_ext_tag_input\" type=\"text\" placeholder=\""
|
||||
+ escapeExpression(((helper = (helper = helpers.addtags || (depth0 != null ? depth0.addtags : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"addtags","hash":{},"data":data}) : helper)))
|
||||
+ "\">\n </div>\n <a href=\"#\" class=\"pkt_ext_btn pkt_ext_btn_disabled\">"
|
||||
+ escapeExpression(((helper = (helper = helpers.save || (depth0 != null ? depth0.save : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"save","hash":{},"data":data}) : helper)))
|
||||
+ "</a>\n </div>\n <p class=\"pkt_ext_edit_msg\"></p> \n</div>";
|
||||
+ "</a>\n </div>\n</div>";
|
||||
},"useData":true});
|
||||
templates['signup_shell'] = template({"1":function(depth0,helpers,partials,data) {
|
||||
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,2 +0,0 @@
|
||||
<div class="pkt_ext_suggestedtag_detailshown">
|
||||
</div>
|
||||
@ -1,8 +1,4 @@
|
||||
<div class="pkt_ext_initload">
|
||||
<div class="pkt_ext_logo"></div>
|
||||
<div class="pkt_ext_topdetail">
|
||||
<h2>{{saving}}</h2>
|
||||
</div>
|
||||
<div class="pkt_ext_initload">
|
||||
<div class="pkt_ext_loadingspinner"><div></div></div>
|
||||
</div>
|
||||
<div class="pkt_ext_detail">
|
||||
@ -14,10 +10,11 @@
|
||||
<ul>
|
||||
<li><a class="pkt_ext_removeitem" href="#">{{removepage}}</a></li>
|
||||
<li class="pkt_ext_actions_separator"></li>
|
||||
<li><a class="pkt_ext_openpocket" href="https://{{pockethost}}/a?src=ff_ext_saved" target="_blank">{{viewlist}}</a></li>
|
||||
<li><a class="pkt_ext_openpocket" href="http://{{pockethost}}/a?src=ff_ext_saved" target="_blank">{{viewlist}}</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
<p class="pkt_ext_edit_msg"></p>
|
||||
<div class="pkt_ext_tag_detail pkt_ext_cf">
|
||||
<div class="pkt_ext_tag_input_wrapper">
|
||||
<div class="pkt_ext_tag_input_blocker"></div>
|
||||
@ -25,5 +22,4 @@
|
||||
</div>
|
||||
<a href="#" class="pkt_ext_btn pkt_ext_btn_disabled">{{save}}</a>
|
||||
</div>
|
||||
<p class="pkt_ext_edit_msg"></p>
|
||||
</div>
|
||||
@ -223,6 +223,8 @@ var pktApi = (function() {
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// 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
|
||||
@ -230,10 +232,15 @@ var pktApi = (function() {
|
||||
clearUserData();
|
||||
}
|
||||
|
||||
// Handle error message
|
||||
var errorMessage = request.getResponseHeader("X-Error") || request.statusText;
|
||||
var error = {message: errorMessage};
|
||||
options.error(error, request);
|
||||
// Check to handle Pocket error
|
||||
var errorMessage = request.getResponseHeader("X-Error");
|
||||
if (typeof errorMessage !== "undefined") {
|
||||
options.error(new Error(errorMessage), request);
|
||||
return;
|
||||
}
|
||||
|
||||
// Handle other error
|
||||
options.error(new Error(request.statusText), request);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user