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

Bug 1471585 - Stop assuming that BookmarkingUI.anchor can be null. r=standard8

Browse Source 
MozReview-Commit-ID: JpObSnChEU0

--HG--
extra : rebase_source : 0b96b14c94a5823073cafe65e327b7294f5574bf
This commit is contained in:
Dão Gottwald 2018-06-27 15:14:27 +02:00
parent a7ac6fe27f
commit 50b93853b4
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,10 +95,9 @@ var StarUI = {
this.quitEditMode();
}
if (this._anchorToolbarButton) {
this._anchorToolbarButton.removeAttribute("open");
this._anchorToolbarButton = null;
}
this._anchorElement.removeAttribute("open");
this._anchorElement = null;
this._restoreCommandsState();
let removeBookmarksOnPopupHidden = this._removeBookmarksOnPopupHidden;
this._removeBookmarksOnPopupHidden = false;
@ -215,7 +214,7 @@ var StarUI = {
}
},
async showEditBookmarkPopup(aNode, aAnchorElement, aPosition, aIsNewBookmark, aUrl, aIsCurrentBrowser = true) {
async showEditBookmarkPopup(aNode, aIsNewBookmark, aUrl, aIsCurrentBrowser = true) {
// Slow double-clicks (not true double-clicks) shouldn't
// cause the panel to flicker.
if (this.panel.state != "closed") {
@ -261,12 +260,8 @@ var StarUI = {
this.beginBatch();
if (aAnchorElement && aAnchorElement.closest("#urlbar")) {
this._anchorToolbarButton = aAnchorElement;
aAnchorElement.setAttribute("open", "true");
} else {
this._anchorToolbarButton = null;
}
this._anchorElement = BookmarkingUI.anchor;
this._anchorElement.setAttribute("open", "true");
let onPanelReady = fn => {
let target = this.panel;
@ -285,7 +280,7 @@ var StarUI = {
hiddenRows: ["location", "keyword"],
focusedElement: "preferred"});
this.panel.openPopup(aAnchorElement, aPosition);
this.panel.openPopup(this._anchorElement, "bottomcenter topright");
},
_setIconAndPreviewImage(aIsCurrentBrowser) {
@ -481,16 +476,7 @@ var PlacesCommandHook = {
let node = await PlacesUIUtils.promiseNodeLikeFromFetchInfo(info);
let anchor = BookmarkingUI.anchor;
if (anchor) {
await StarUI.showEditBookmarkPopup(node, anchor, "bottomcenter topright",
isNewBookmark, url, isCurrentBrowser);
return;
}
// Fall back to showing the panel over the content area.
await StarUI.showEditBookmarkPopup(node, aBrowser, "overlap", isNewBookmark,
url, isCurrentBrowser);
await StarUI.showEditBookmarkPopup(node, isNewBookmark, url, isCurrentBrowser);
},
/**