Bug 1315615 - Fix no-unused-vars issues in the Pocket extension. r?jaws
MozReview-Commit-ID: 4L8XCRo1PWe
--- a/browser/extensions/pocket/bootstrap.js
+++ b/browser/extensions/pocket/bootstrap.js
@@ -172,17 +172,16 @@ var PocketContextMenu = {
if (element)
element.remove();
}
}
},
observe: function(aSubject, aTopic, aData) {
let subject = aSubject.wrappedJSObject;
let document = subject.menu.ownerDocument;
- let window = document.defaultView;
let pocketEnabled = CustomizableUI.getPlacementOfWidget("pocket-button");
let showSaveCurrentPageToPocket = !(subject.onTextInput || subject.onLink ||
subject.isContentSelected || subject.onImage ||
subject.onCanvas || subject.onVideo || subject.onAudio);
let targetUrl = subject.onLink ? subject.linkUrl : subject.pageUrl;
let targetURI = Services.io.newURI(targetUrl, null, null);
let canPocket = pocketEnabled && (targetURI.schemeIs("http") || targetURI.schemeIs("https") ||
--- a/browser/extensions/pocket/content/main.js
+++ b/browser/extensions/pocket/content/main.js
@@ -47,29 +47,24 @@ XPCOMUtils.defineLazyModuleGetter(this,
XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode",
"resource://gre/modules/ReaderMode.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "pktApi",
"chrome://pocket/content/pktApi.jsm");
var pktUI = (function() {
// -- Initialization (on startup and new windows) -- //
- var inited = false;
var _currentPanelDidShow;
var _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("extensions.pocket.settings.");
-
var overflowMenuWidth = 230;
var overflowMenuHeight = 475;
var savePanelWidth = 350;
var savePanelHeights = {collapsed: 153, expanded: 272};
// -- Event Handling -- //
/**
@@ -88,23 +83,16 @@ var pktUI = (function() {
_currentPanelDidHide(event);
}
// clear the panel
getPanelFrame().setAttribute('src', 'about:blank');
}
- /**
- * Event handler when Pocket bookmark bar entry is pressed
- */
- function pocketBookmarkBarOpenPocketCommand(event) {
- openTabWithUrl('https://getpocket.com/a/', true);
- }
-
// -- Communication to API -- //
/**
* Either save or attempt to log the user in
*/
function tryToSaveCurrentPage() {
tryToSaveUrl(getCurrentUrl(), getCurrentTitle());
}
@@ -168,17 +156,17 @@ var pktUI = (function() {
{
variant = 'overflow';
}
else
{
variant = 'storyboard_lm';
}
- var panelId = showPanel("about:pocket-signup?pockethost="
+ showPanel("about:pocket-signup?pockethost="
+ Services.prefs.getCharPref("extensions.pocket.site")
+ "&fxasignedin="
+ fxasignedin
+ "&variant="
+ variant
+ '&controlvariant='
+ controlvariant
+ '&inoverflowmenu='
@@ -569,24 +557,16 @@ var pktUI = (function() {
return null;
}
function isInOverflowMenu() {
var subview = getSubview();
return !!subview;
}
- function hasLegacyExtension() {
- return !!document.getElementById('RIL_urlbar_add');
- }
-
- function isHidden() {
- return _isHidden;
- }
-
function getFirefoxAccountSignedInUser(callback) {
fxAccounts.getSignedInUser().then(userData => {
callback(userData);
}).then(null, error => {
callback();
});
}
--- a/browser/extensions/pocket/content/panels/js/saved.js
+++ b/browser/extensions/pocket/content/panels/js/saved.js
@@ -23,24 +23,21 @@ var PKT_SAVED_OVERLAY = function (option
this.mouseInside = false;
this.userTags = [];
this.cxt_suggested_available = 0;
this.cxt_entered = 0;
this.cxt_suggested = 0;
this.cxt_removed = 0;
this.justaddedsuggested = false;
this.fillTagContainer = function(tags, container, tagclass) {
- var newtagleft = 0;
container.children().remove();
for (var i = 0; i < tags.length; i++) {
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;
}
};
this.fillUserTags = function() {
thePKT_SAVED.sendMessage("getTags", {}, function(resp)
{
if (typeof resp == 'object' && typeof resp.tags == 'object')
{
myself.userTags = resp.tags;
@@ -602,9 +599,8 @@ PKT_SAVED.prototype = {
'https://'+ pocketHost +'/tos?s=ffi&t=tos&tv=panel_tryit',
'https://'+ pocketHost +'/privacy?s=ffi&t=privacypolicy&tv=panel_tryit'
]
}, function(resp) {
window.pocketStrings = resp.strings;
window.thePKT_SAVED.create();
});
});
-
--- a/browser/extensions/pocket/content/panels/js/signup.js
+++ b/browser/extensions/pocket/content/panels/js/signup.js
@@ -58,18 +58,16 @@ var PKT_SIGNUP_OVERLAY = function (optio
this.dictJSON = window.pocketStrings;
};
};
PKT_SIGNUP_OVERLAY.prototype = {
create : function()
{
- var myself = this;
-
var controlvariant = window.location.href.match(/controlvariant=([\w|\.]*)&?/);
if (controlvariant && controlvariant.length > 1)
{
this.controlvariant = controlvariant[1];
}
var variant = window.location.href.match(/variant=([\w|\.]*)&?/);
if (variant && variant.length > 1)
{
@@ -188,9 +186,8 @@ PKT_SIGNUP.prototype = {
'https://'+ pocketHost +'/tos?s=ffi&t=tos&tv=panel_tryit',
'https://'+ pocketHost +'/privacy?s=ffi&t=privacypolicy&tv=panel_tryit'
]
}, function(resp) {
window.pocketStrings = resp.strings;
window.thePKT_SIGNUP.create();
});
});
-