Fix some buglets; remove more comm dependencies.

browser/base/content/browser.js

@@ -377,12 +377,12 @@ function Startup()
   
   // Focus the content area unless we're loading a blank page
   var elt;
-  if (uriToLoad == "about:blank" && !toolbar.hidden &&
-      gURLBar && !gURLBar.parentNode.parentNode.collapsed)
-  {
-    elt = gURLBar;
-  } else {
-    elt = _content;
+  if (uriToLoad == "about:blank") {
+    var navBar = document.getElementById("nav-bar");
+    if (navBar && !navBar.hidden && gURLBar && !gURLBar.parentNode.parentNode.collapsed)
+      elt = gURLBar;
+    else
+      elt = _content;
   }
   
   setTimeout(delayedStartup, 0, elt);
@@ -407,7 +407,6 @@ function delayedStartup(aElt)
   checkForDefaultBrowser();
 
   // now load bookmarks after a delay
-
   BMSVC.ReadBookmarks();
   var bt = document.getElementById("bookmarks-toolbar");
   if (bt && "toolbar" in bt)
@@ -3997,8 +3996,7 @@ nsContextMenu.prototype = {
             result = true;
 
           // format "Search for <selection>" string to show in menu
-          var bundle = document.getElementById("contentAreaBundle");
-          searchSelectText = bundle.getFormattedString("searchText", [searchSelectText]);
+          searchSelectText = gNavigatorBundle.getFormattedString("searchText", [searchSelectText]);
           this.setItemAttr("context-searchselect", "label", searchSelectText);
         } 
         return result;

browser/base/content/browser.xul

@@ -51,7 +51,7 @@
 
   <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
   <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/findUtils.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
   <script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
@@ -62,7 +62,6 @@
     <stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
     <stringbundle id="bundle_browser_region" src="chrome://navigator-region/locale/region.properties"/>
     <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
-    <stringbundle id="contentAreaBundle" src="chrome://communicator/locale/contentAreaCommands.properties"/>
   </stringbundleset>
 
   <commandset commandupdater="true"

browser/base/locale/browser.properties

@@ -52,3 +52,23 @@ showskinsdescription=true
 #   e.g. "Search Google for abc"
 # DO NOT change the %S order when translate, the first %S must be the search engine name.
 searchFor=Search %S for "%S"
+
+# context menu strings
+
+searchText=Web Search for "%S"
+
+SavePageTitle=Save Web Page
+SaveImageTitle=Save Picture
+SaveLinkTitle=Save As
+DefaultSaveFileName=index
+WebPageCompleteFilter=Web Page, complete
+WebPageHTMLOnlyFilter=Web Page, HTML only
+
+# LOCALIZATION NOTE (filesFolder):
+#    This is the name of the folder that is created parallel to a HTML file 
+#    when it is saved "With Images". The %S section is replaced with the
+#    leaf name of the file being saved (minus extension).
+filesFolder=%S_files
+
+saveLinkErrorMsg=The link could not be saved.  The web page might have been removed or had its name changed.
+saveLinkErrorTitle=Save Link

toolkit/content/findUtils.js

@@ -0,0 +1,118 @@
+# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+# ***** BEGIN LICENSE BLOCK *****
+# Version: NPL 1.1/GPL 2.0/LGPL 2.1
+# 
+# The contents of this file are subject to the Netscape Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/NPL/
+# 
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is 
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   Simon Fraser <sfraser@netscape.com>
+#   Dean Tessman <dean_tessman@hotmail.com>
+# 
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or 
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the NPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the NPL, the GPL or the LGPL.
+# 
+# ***** END LICENSE BLOCK ***** */
+var gPromptService;
+var gFindBundle;
+
+// browser is the <browser> element
+// rootSearchWindow is the window to constrain the search to (normally window._content)
+// startSearchWindow is the frame to start searching (can be, and normally, rootSearchWindow)
+function findInPage(browser, rootSearchWindow, startSearchWindow)
+{
+  var findInst = browser.webBrowserFind;
+  // set up the find to search the focussedWindow, bounded by the content window.
+  var findInFrames = findInst.QueryInterface(Components.interfaces.nsIWebBrowserFindInFrames);
+  findInFrames.rootSearchFrame = rootSearchWindow;
+  findInFrames.currentSearchFrame = startSearchWindow;
+
+  // always search in frames for now. We could add a checkbox to the dialog for this.
+  findInst.searchFrames = true;
+  
+  // is the dialog up already?
+  if ("findDialog" in window && window.findDialog)
+    window.findDialog.focus();
+  else
+    window.findDialog = window.openDialog("chrome://global/content/finddialog.xul", "_blank", "chrome,resizable=no,dependent=yes", findInst);
+}
+
+function findAgainInPage(browser, rootSearchWindow, startSearchWindow, reverse)
+{
+  if ("findDialog" in window && window.findDialog)
+    window.findDialog.focus();
+  else
+  {
+    var findInst = browser.webBrowserFind;
+    // set up the find to search the focussedWindow, bounded by the content window.
+    var findInFrames = findInst.QueryInterface(Components.interfaces.nsIWebBrowserFindInFrames);
+    findInFrames.rootSearchFrame = rootSearchWindow;
+    findInFrames.currentSearchFrame = startSearchWindow;
+
+    // always search in frames for now. We could add a checkbox to the dialog for this.
+    findInst.searchFrames = true;
+
+    // get the find service, which stores global find state, and init the
+    // nsIWebBrowser find with it. We don't assume that there was a previous
+    // Find that set this up.
+    var findService = Components.classes["@mozilla.org/find/find_service;1"]
+                           .getService(Components.interfaces.nsIFindService);
+    findInst.searchString  = findService.searchString;
+    findInst.matchCase     = findService.matchCase;
+    findInst.wrapFind      = findService.wrapFind;
+    findInst.entireWord    = findService.entireWord;
+    findInst.findBackwards = findService.findBackwards ^ reverse;
+
+    var found = false;
+    if (findInst.searchString.length == 0) {
+      // no previous find text
+      findInPage(browser, rootSearchWindow, startSearchWindow);
+      return;
+    }
+
+    found = findInst.findNext();
+    if (!found) {
+      if (!gPromptService)
+        gPromptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService()
+                                   .QueryInterface(Components.interfaces.nsIPromptService);                                     
+      if (!gFindBundle)
+        gFindBundle = document.getElementById("findBundle");
+          
+      gPromptService.alert(window, gFindBundle.getString("notFoundTitle"), gFindBundle.getString("notFoundWarning"));
+    }      
+
+    // Reset to normal value, otherwise setting can get changed in find dialog
+    findInst.findBackwards = findService.findBackwards; 
+  }
+}
+
+function canFindAgainInPage()
+{
+    var findService = Components.classes["@mozilla.org/find/find_service;1"]
+                           .getService(Components.interfaces.nsIFindService);
+    return (findService.searchString.length > 0);
+}
+

toolkit/jar.mn

@@ -5,6 +5,7 @@ toolkit.jar:
 +        content/global/widgets/toolbar.xml                 (content/widgets/toolbar.xml)
 *+       content/global/finddialog.xul                      (content/finddialog.xul)
 *+       content/global/finddialog.js                       (content/finddialog.js)
+*+       content/global/findUtils.js                        (content/findUtils.js)
 *        content/global/customizeToolbar.xul                (content/customizeToolbar.xul)
 *        content/global/customizeToolbar.js                 (content/customizeToolbar.js)
          content/global/customizeToolbar.css                (content/customizeToolbar.css)