1106274 - Go history menu items end up at the bottom of the menu and not between the startHistorySeparator and endHistorySeparator

Status: RESOLVED FIXED

(SeaMonkey :: Bookmarks & History, defect)

Description

[Philip Chee]

In Bug 751922 I made a mistake and the Go history menu items end up at the bottom of the menu.
aParent.appendChild(menuitem)
should have been:
aParent.insertBefore(menuitem, aAnchor)

Comment 1

[Philip Chee]

Attachment: Patch v1.0 Proposed fix

This patch also:
1. Removes unused CONSTs
2. Moves the remaining global CONST into FillHistoryMenu()

Comment 2

[[e-mail]]

Comment on attachment 8530676 [details] [diff] [review]
Patch v1.0 Proposed fix

D'oh!

Comment 3

[Philip Chee]

Pushed to comm-central:
http://hg.mozilla.org/comm-central/rev/ccba476cdc05

Comment 4

[l.krmelu1992]

Comment on attachment 8530676 [details] [diff] [review]
Patch v1.0 Proposed fix

># HG changeset patch
># Parent c507ff616eec26a14a6c6c2027775f4abe5f70bd
>Bug 1106274 - Go history menu items end up at the bottom of the menu and not between the startHistorySeparator and endHistorySeparator
>
>diff --git a/suite/browser/sessionHistoryUI.js b/suite/browser/sessionHistoryUI.js
>--- a/suite/browser/sessionHistoryUI.js
>+++ b/suite/browser/sessionHistoryUI.js
>@@ -1,15 +1,12 @@
> /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
> /* This Source Code Form is subject to the terms of the Mozilla Public
>  * License, v. 2.0. If a copy of the MPL was not distributed with this
>  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
>-const MAX_HISTORY_MENU_ITEMS = 15;
>-const MAX_URLBAR_HISTORY_MENU_ITEMS = 30;
>-const MAX_URLBAR_HISTORY_ITEMS = 100;
> 
> function toggleTabsFromOtherComputers()
>   {
>     // enable/disable the Tabs From Other Computers menu
>     let menuitem = document.getElementById("sync-tabs-menuitem");
> 
>     // If Sync isn't configured yet, then don't show the menuitem.
>     if (Weave.Status.checkSetup() == Weave.CLIENT_NOT_CONFIGURED ||
>@@ -32,16 +29,17 @@ function FillHistoryMenu(aParent, aMenu)
>   // Remove old entries if any
>   deleteHistoryItems(aParent);
> 
>   var sessionHistory = getWebNavigation().sessionHistory;
> 
>   var count = sessionHistory.count;
>   var index = sessionHistory.index;
>   var end;
>+  const MAX_HISTORY_MENU_ITEMS = 15;
> 
>   switch (aMenu)
>   {
>     case "back":
>       end = index > MAX_HISTORY_MENU_ITEMS ? index - MAX_HISTORY_MENU_ITEMS
>                                            : 0;
>       if (index <= end)
>         return false;
>@@ -144,17 +142,17 @@ function createHistoryMenuItem(aParent, 
>         if (aURI) {
>           menuitem.setAttribute("image",
>                                 PlacesUtils.favicons
>                                            .getFaviconLinkForIcon(aURI).spec);
>         }
>       }
>     );
>   }
>-  aParent.appendChild(menuitem);
>+  aParent.insertBefore(menuitem, aAnchor);
> }
> 
> function deleteHistoryItems(aParent)
> {
>   var children = aParent.childNodes;
>   for (let i = children.length - 1; i >= 0; --i)
>   {
>     if (children[i].hasAttribute("index"))