mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-26 11:45:37 +00:00
Bug 1471585 - Stop assuming that BookmarkingUI.anchor can be null. r=standard8
MozReview-Commit-ID: JpObSnChEU0 --HG-- extra : rebase_source : 0b96b14c94a5823073cafe65e327b7294f5574bf
This commit is contained in:
parent
a7ac6fe27f
commit
50b93853b4
@ -95,10 +95,9 @@ var StarUI = {
|
|||||||
this.quitEditMode();
|
this.quitEditMode();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this._anchorToolbarButton) {
|
this._anchorElement.removeAttribute("open");
|
||||||
this._anchorToolbarButton.removeAttribute("open");
|
this._anchorElement = null;
|
||||||
this._anchorToolbarButton = null;
|
|
||||||
}
|
|
||||||
this._restoreCommandsState();
|
this._restoreCommandsState();
|
||||||
let removeBookmarksOnPopupHidden = this._removeBookmarksOnPopupHidden;
|
let removeBookmarksOnPopupHidden = this._removeBookmarksOnPopupHidden;
|
||||||
this._removeBookmarksOnPopupHidden = false;
|
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
|
// Slow double-clicks (not true double-clicks) shouldn't
|
||||||
// cause the panel to flicker.
|
// cause the panel to flicker.
|
||||||
if (this.panel.state != "closed") {
|
if (this.panel.state != "closed") {
|
||||||
@ -261,12 +260,8 @@ var StarUI = {
|
|||||||
|
|
||||||
this.beginBatch();
|
this.beginBatch();
|
||||||
|
|
||||||
if (aAnchorElement && aAnchorElement.closest("#urlbar")) {
|
this._anchorElement = BookmarkingUI.anchor;
|
||||||
this._anchorToolbarButton = aAnchorElement;
|
this._anchorElement.setAttribute("open", "true");
|
||||||
aAnchorElement.setAttribute("open", "true");
|
|
||||||
} else {
|
|
||||||
this._anchorToolbarButton = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
let onPanelReady = fn => {
|
let onPanelReady = fn => {
|
||||||
let target = this.panel;
|
let target = this.panel;
|
||||||
@ -285,7 +280,7 @@ var StarUI = {
|
|||||||
hiddenRows: ["location", "keyword"],
|
hiddenRows: ["location", "keyword"],
|
||||||
focusedElement: "preferred"});
|
focusedElement: "preferred"});
|
||||||
|
|
||||||
this.panel.openPopup(aAnchorElement, aPosition);
|
this.panel.openPopup(this._anchorElement, "bottomcenter topright");
|
||||||
},
|
},
|
||||||
|
|
||||||
_setIconAndPreviewImage(aIsCurrentBrowser) {
|
_setIconAndPreviewImage(aIsCurrentBrowser) {
|
||||||
@ -481,16 +476,7 @@ var PlacesCommandHook = {
|
|||||||
|
|
||||||
let node = await PlacesUIUtils.promiseNodeLikeFromFetchInfo(info);
|
let node = await PlacesUIUtils.promiseNodeLikeFromFetchInfo(info);
|
||||||
|
|
||||||
let anchor = BookmarkingUI.anchor;
|
await StarUI.showEditBookmarkPopup(node, isNewBookmark, url, isCurrentBrowser);
|
||||||
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);
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user