Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 946873 - fix Australis bookmarks menu button (literal) edgecase, r=Unfocused

Browse Source 
--HG--
extra : rebase_source : 04aa6fd21331bfe7d5f4d2f44d76680a111dc55d
This commit is contained in:
Gijs Kruitbosch 2014-02-25 11:50:12 +00:00
parent c7e6ad1726
commit 797e3adaa1
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
browser/base/content/browser-places.js
View File

@ -1061,6 +1061,16 @@ let BookmarkingUI = {
if (event.target != event.currentTarget)
return;
// Ideally this code would never be reached, but if you click the outer
// button's border, some cpp code for the menu button's so-called XBL binding
// decides to open the popup even though the dropmarker is invisible.
if (this._currentAreaType == CustomizableUI.TYPE_MENU_PANEL) {
this._showSubview();
event.preventDefault();
event.stopPropagation();
return;
}
let widget = CustomizableUI.getWidget("bookmarks-menu-button")
.forWindow(window);
if (widget.overflowed) {
@ -1346,25 +1356,30 @@ let BookmarkingUI = {
}, 1000);
},
_showSubview: function() {
let view = document.getElementById("PanelUI-bookmarks");
view.addEventListener("ViewShowing", this);
view.addEventListener("ViewHiding", this);
let anchor = document.getElementById("bookmarks-menu-button");
anchor.setAttribute("closemenu", "none");
PanelUI.showSubView("PanelUI-bookmarks", anchor,
CustomizableUI.AREA_PANEL);
},
onCommand: function BUI_onCommand(aEvent) {
if (aEvent.target != aEvent.currentTarget) {
return;
}
// Handle special case when the button is in the panel.
let widget = CustomizableUI.getWidget("bookmarks-menu-button")
.forWindow(window);
let isBookmarked = this._itemIds.length > 0;
if (this._currentAreaType == CustomizableUI.TYPE_MENU_PANEL) {
let view = document.getElementById("PanelUI-bookmarks");
view.addEventListener("ViewShowing", this);
view.addEventListener("ViewHiding", this);
widget.node.setAttribute("closemenu", "none");
PanelUI.showSubView("PanelUI-bookmarks", widget.node,
CustomizableUI.AREA_PANEL);
this._showSubview();
return;
}
let widget = CustomizableUI.getWidget("bookmarks-menu-button")
.forWindow(window);
if (widget.overflowed) {
// Allow to close the panel if the page is already bookmarked, cause
// we are going to open the edit bookmark panel.