Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 12:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1252661 fix visibility state of pocket menu items, r=gijs

Browse Source
This commit is contained in:
Shane Caraveo 2016-03-04 14:38:13 -08:00
parent 7629900d93
commit 47966c0504
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
browser/extensions/pocket/bootstrap.js vendored
View File

@ -285,26 +285,44 @@ var PocketContextMenu = {
// PocketReader
// Listen for reader mode setup and add our button to the reader toolbar
var PocketReader = {
_hidden: true,
get hidden() {
return this._hidden;
},
set hidden(hide) {
hide = !!hide;
if (hide === this._hidden)
return;
this._hidden = hide;
this.update();
},
startup: function() {
// Setup the listeners, update will be called when the widget is added,
// no need to do that now.
let mm = Services.mm;
mm.addMessageListener("Reader:OnSetup", this);
mm.addMessageListener("Reader:Clicked-pocket-button", this);
mm.broadcastAsyncMessage("Reader:AddButton",
{ id: "pocket-button",
title: gPocketBundle.GetStringFromName("pocket-button.tooltiptext"),
image: "chrome://pocket/content/panels/img/pocket.svg#pocket-mark" });
},
shutdown: function() {
let mm = Services.mm;
mm.removeMessageListener("Reader:OnSetup", this);
mm.removeMessageListener("Reader:Clicked-pocket-button", this);
mm.broadcastAsyncMessage("Reader:RemoveButton", { id: "pocket-button" });
this.hidden = true;
},
update: function() {
if (this.hidden) {
Services.mm.broadcastAsyncMessage("Reader:RemoveButton", { id: "pocket-button" });
} else {
Services.mm.broadcastAsyncMessage("Reader:AddButton",
{ id: "pocket-button",
title: gPocketBundle.GetStringFromName("pocket-button.tooltiptext"),
image: "chrome://pocket/content/panels/img/pocket.svg#pocket-mark" });
}
},
receiveMessage: function(message) {
switch (message.name) {
case "Reader:OnSetup": {
// tell the reader about our button. A chrome url here doesn't work, but
// we can use the resoure url.
// Tell the reader about our button.
message.target.messageManager.
sendAsyncMessage("Reader:AddButton", { id: "pocket-button",
title: gPocketBundle.GetStringFromName("pocket-button.tooltiptext"),
@ -356,10 +374,10 @@ var PocketOverlay = {
this._sheetType);
AboutSaved.register();
AboutSignup.register();
CreatePocketWidget(reason);
CustomizableUI.addListener(this);
PocketContextMenu.init();
PocketReader.startup();
CustomizableUI.addListener(this);
CreatePocketWidget(reason);
PocketContextMenu.init();
if (reason != APP_STARTUP) {
for (let win of allBrowserWindows()) {
@ -459,20 +477,12 @@ var PocketOverlay = {
sib.parentNode.insertBefore(sep, sib);
sib.parentNode.insertBefore(menu, sib);
}
this.updatePocketItemVisibility(document);
},
onWidgetAdded: function(aWidgetId, aArea, aPosition) {
for (let win of allBrowserWindows()) {
this.updatePocketItemVisibility(win.document);
onWidgetAfterDOMChange: function(aWidgetNode) {
if (aWidgetNode.id != "pocket-button") {
return;
}
},
onWidgetRemoved: function(aWidgetId, aArea, aPosition) {
for (let win of allBrowserWindows()) {
this.updatePocketItemVisibility(win.document);
}
},
updatePocketItemVisibility: function(doc) {
let doc = aWidgetNode.ownerDocument;
let hidden = !CustomizableUI.getPlacementOfWidget("pocket-button");
for (let prefix of ["panelMenu_", "menu_", "BMB_"]) {
let element = doc.getElementById(prefix + "pocket");
@ -482,11 +492,7 @@ var PocketOverlay = {
}
}
// enable or disable reader button
if (hidden) {
PocketReader.shutdown();
} else {
PocketReader.startup();
}
PocketReader.hidden = hidden;
},
addStyles: function(win) {

6
toolkit/components/reader/AboutReader.jsm
View File

@ -173,7 +173,8 @@ AboutReader.prototype = {
}
case "Reader:AddButton": {
if (message.data.id && message.data.image) {
if (message.data.id && message.data.image &&
!this._doc.getElementById(message.data.id)) {
let btn = this._doc.createElement("button");
btn.setAttribute("class", "button");
btn.setAttribute("style", "background-image: url('" + message.data.image + "')");
@ -193,7 +194,8 @@ AboutReader.prototype = {
case "Reader:RemoveButton": {
if (message.data.id) {
let btn = this._doc.getElementById(message.data.id);
btn.remove();
if (btn)
btn.remove();
}
break;
}