Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-26 03:35:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1514724 - move pocket page action into markup, r=jaws

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D14803

--HG--
extra : rebase_source : bc5d116af660342b069f39a1b3ccbd04dedcd6f9
This commit is contained in:
Gijs Kruitbosch 2018-12-28 11:27:00 +00:00
parent afdcf0d1bb
commit b5785ef772
3 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser/base/content/browser.xul
View File

@ -1047,6 +1047,18 @@ xmlns="http://www.w3.org/1999/xhtml"
role="presentation"/>
</hbox>
</hbox>
<hbox id="pocket-button-box"
hidden="true"
class="urlbar-icon-wrapper urlbar-page-action"
onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('pocket'), event, this);">
<image id="pocket-button"
class="urlbar-icon"
role="button"/>
<hbox id="pocket-button-animatable-box">
<image id="pocket-button-animatable-image"
role="presentation"/>
</hbox>
</hbox>
</hbox>
</textbox>
</toolbaritem>

41
browser/components/pocket/content/SaveToPocket.jsm
View File

@ -85,46 +85,17 @@ var PocketPageAction = {
_urlbarNodeInMarkup: true,
onBeforePlacedInWindow(window) {
let doc = window.document;
if (doc.getElementById("pocket-button-box")) {
return;
}
let wrapper = doc.createXULElement("hbox");
wrapper.id = "pocket-button-box";
wrapper.classList.add("urlbar-icon-wrapper", "urlbar-page-action");
let animatableBox = doc.createXULElement("hbox");
animatableBox.id = "pocket-animatable-box";
let animatableImage = doc.createXULElement("image");
animatableImage.id = "pocket-animatable-image";
animatableImage.setAttribute("role", "presentation");
let tooltip =
gPocketBundle.GetStringFromName("pocket-button.tooltiptext");
animatableImage.setAttribute("tooltiptext", tooltip);
let pocketButton = doc.createXULElement("image");
pocketButton.id = "pocket-button";
pocketButton.classList.add("urlbar-icon");
pocketButton.setAttribute("role", "button");
pocketButton.setAttribute("tooltiptext", tooltip);
wrapper.appendChild(pocketButton);
wrapper.appendChild(animatableBox);
animatableBox.appendChild(animatableImage);
let iconBox = doc.getElementById("page-action-buttons");
iconBox.appendChild(wrapper);
wrapper.hidden = true;
wrapper.addEventListener("click", event => {
let {BrowserPageActions} = wrapper.ownerGlobal;
BrowserPageActions.doCommandForAction(this, event, wrapper);
});
doc.getElementById("pocket-button").setAttribute("tooltiptext", tooltip);
doc.getElementById("pocket-button-animatable-image").setAttribute("tooltiptext", tooltip);
},
onIframeShowing(iframe, panel) {
Pocket.onShownInPhotonPageActionPanel(panel, iframe);
let doc = panel.ownerDocument;
let urlbarNode = doc.getElementById("pocket-button-box");
if (!urlbarNode || urlbarNode.hidden) {
if (!urlbarNode) {
return;
}
@ -196,7 +167,7 @@ var PocketPageAction = {
let urlbarNode = browserWindow.document.getElementById(
BrowserPageActions.urlbarButtonNodeIDForActionID(this.pageAction.id)
);
if (!urlbarNode) {
if (!urlbarNode || urlbarNode.hidden) {
return;
}
let browser = browserWindow.gBrowser.selectedBrowser;
@ -218,9 +189,7 @@ var PocketPageAction = {
for (let win of browserWindows()) {
let doc = win.document;
let pocketButtonBox = doc.getElementById("pocket-button-box");
if (pocketButtonBox) {
pocketButtonBox.remove();
}
pocketButtonBox.setAttribute("hidden", "true");
}
this.pageAction.remove();

6
browser/components/pocket/test/browser_pocket_ui_check.js
View File

@ -17,6 +17,8 @@ add_task(async function() {
checkWindowProperties(true, ["Pocket", "pktUI", "pktUIMessaging"]);
checkElements(true, ["pocket-button", "appMenu-library-pocket-button"]);
let buttonBox = document.getElementById("pocket-button-box");
is(buttonBox.hidden, false, "Button should not have been hidden");
// check context menu exists
info("checking content context menu");
@ -40,8 +42,10 @@ add_task(async function() {
await promisePocketDisabled();
checkWindowProperties(false, ["Pocket", "pktUI", "pktUIMessaging"]);
checkElements(false, ["pocket-button", "appMenu-library-pocket-button",
checkElements(false, ["appMenu-library-pocket-button",
"context-pocket", "context-savelinktopocket"]);
buttonBox = document.getElementById("pocket-button-box");
is(buttonBox.hidden, true, "Button should have been hidden");
await promisePocketReset();
});