diff --git a/mozilla/xpfe/components/search/resources/internet.js b/mozilla/xpfe/components/search/resources/internet.js index f7e78f88ab7..36ee088eb14 100644 --- a/mozilla/xpfe/components/search/resources/internet.js +++ b/mozilla/xpfe/components/search/resources/internet.js @@ -1,6 +1,12 @@ +var gText = ""; +var gSites = ""; + function doSearch() { + gText = ""; + gSites = ""; + // get user text to find var textNode = document.getElementById("searchtext"); if (!textNode) return(false); @@ -23,6 +29,8 @@ function doSearch() } if (treeChildrenNode == null) return(false); + gText = text; + var searchURL=""; var foundEngine = false; @@ -40,6 +48,16 @@ function doSearch() if (!engineURI) continue; dump ("# " + x + ": " + engineURI + "\n"); + var searchEngineName = treeItem.childNodes[0].childNodes[1].childNodes[0].getAttribute("value"); + if (searchEngineName != "") + { + if (gSites != "") + { + gSites += ", "; + } + gSites += searchEngineName; + } + if (searchURL == "") { searchURL = "internetsearch:"; @@ -125,15 +143,16 @@ function saveSearch() { var resultsTree = parent.frames[1].document.getElementById("internetresultstree"); if (!resultsTree) return(false); - var searchURL = tree.getAttribute("ref"); - if (!searchURL) return(false); + var searchURL = resultsTree.getAttribute("ref"); + if ((!searchURL) || (searchURL == "")) return(false); dump("Bookmark search URL: " + searchURL + "\n"); var bmks = Components.classes["component://netscape/browser/bookmarks-service"].getService(); - bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService); - // XXX should construct a more interesting/useful title - bmks.AddBookmark(searchURL, "Saved Internet Search"); + if (bmks) bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService); + + var searchTitle = "Search: '" + gText + "' using " + gSites; + if (bmks) bmks.AddBookmark(searchURL, searchTitle); return(true); }