author | Dão Gottwald <dao@mozilla.com> |
Thu, 13 Oct 2016 18:47:52 +0200 | |
changeset 317888 | b3e56f1eb513bf5d0047f69a913e0a390bf56602 |
parent 317887 | 1ae11d588928b3e328fa3ab46142ee71d569c09b |
child 317889 | b62b2d88fd0320fc05e32952c0ffd411ea738011 |
push id | 33170 |
push user | cbook@mozilla.com |
push date | Fri, 14 Oct 2016 10:37:07 +0000 |
treeherder | autoland@0d101ebfd95c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mak |
bugs | 1304617 |
milestone | 52.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
browser/base/content/browser-places.js | file | annotate | diff | comparison | revisions | |
browser/base/content/browser.xul | file | annotate | diff | comparison | revisions |
--- a/browser/base/content/browser-places.js +++ b/browser/base/content/browser-places.js @@ -1412,19 +1412,28 @@ var BookmarkingUI = { // Update the menu when a bookmark has been removed. // The native menubar on Mac doesn't support live update, so this won't // work there. this._populateRecentBookmarks(aHeaderItem, aExtraCSSClass); }; let updatePlacesContextMenu = (shouldHidePrefUI = false) => { let prefEnabled = !shouldHidePrefUI && Services.prefs.getBoolPref(this.RECENTLY_BOOKMARKED_PREF); - document.getElementById("placesContext_showRecentlyBookmarked").hidden = shouldHidePrefUI || prefEnabled; - document.getElementById("placesContext_hideRecentlyBookmarked").hidden = shouldHidePrefUI || !prefEnabled; - document.getElementById("placesContext_recentlyBookmarkedSeparator").hidden = shouldHidePrefUI; + let showItem = document.getElementById("placesContext_showRecentlyBookmarked"); + let hideItem = document.getElementById("placesContext_hideRecentlyBookmarked"); + let separator = document.getElementById("placesContext_recentlyBookmarkedSeparator"); + showItem.hidden = shouldHidePrefUI || prefEnabled; + hideItem.hidden = shouldHidePrefUI || !prefEnabled; + separator.hidden = shouldHidePrefUI; + if (!shouldHidePrefUI) { + // Move to the bottom of the menu. + separator.parentNode.appendChild(separator); + showItem.parentNode.appendChild(showItem); + hideItem.parentNode.appendChild(hideItem); + } }; let onPlacesContextMenuShowing = event => { if (event.target == event.currentTarget) { let triggerPopup = event.target.triggerNode; while (triggerPopup && triggerPopup.localName != "menupopup") { triggerPopup = triggerPopup.parentNode; }
--- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -356,33 +356,30 @@ gContextMenu = null; updateEditUIVisibility();"> #include browser-context.inc </menupopup> <menupopup id="placesContext"> <menuseparator id="placesContext_recentlyBookmarkedSeparator" ignoreitem="true" - ordinal="2" hidden="true"/> <menuitem id="placesContext_hideRecentlyBookmarked" label="&hideRecentlyBookmarked.label;" accesskey="&hideRecentlyBookmarked.accesskey;" oncommand="BookmarkingUI.hideRecentlyBookmarked();" closemenu="single" ignoreitem="true" - ordinal="2" hidden="true"/> <menuitem id="placesContext_showRecentlyBookmarked" label="&showRecentlyBookmarked.label;" accesskey="&showRecentlyBookmarked.accesskey;" oncommand="BookmarkingUI.showRecentlyBookmarked();" closemenu="single" ignoreitem="true" - ordinal="2" hidden="true"/> </menupopup> <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top"> <hbox> <button class="ctrlTab-preview" flex="1"/> <button class="ctrlTab-preview" flex="1"/> <button class="ctrlTab-preview" flex="1"/>