From f109e72bff42beffdf9ab8d539520c115bf296f9 Mon Sep 17 00:00:00 2001
From: "aaronl%netscape.com" <aaronl%netscape.com>
Date: Tue, 14 Jan 2003 23:06:12 +0000
Subject: [PATCH] Backing out bug 187511. Add Find As You Type to menus

---
 .../resources/content/mailWindowOverlay.xul    |  7 -------
 .../resources/content/navigatorOverlay.xul     | 10 +---------
 .../resources/content/viewSourceOverlay.xul    |  5 +----
 .../resources/content/utilityOverlay.xul       | 18 ------------------
 .../resources/locale/en-US/utilityOverlay.dtd  |  6 ------
 5 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 89b983add36..66d6d1c9c2d 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -175,8 +175,6 @@ Rights Reserved.
   <command id="cmd_find" oncommand="goDoCommand('cmd_find')" disabled="true"/>
   <command id="cmd_findAgain" oncommand="goDoCommand('cmd_findAgain')" disabled="true"/>
   <command id="cmd_findPrev"  oncommand="goDoCommand('cmd_findPrev')"  disabled="true"/>
-  <command id="cmd_findTypeText"/>
-  <command id="cmd_findTypeLinks"/>
   <command id="cmd_stop" oncommand="MsgStop();"/>
 </commandset>
 
@@ -324,8 +322,6 @@ Rights Reserved.
   <key id="key_findPrev"  key="&findPrevCmd.key;"    oncommand="goDoCommand('cmd_findPrev')"  modifiers="accel, shift"/>
   <key keycode="&findAgainCmd.key2;"   oncommand="goDoCommand('cmd_findAgain')"/>
   <key keycode="&findPrevCmd.key2;"    oncommand="goDoCommand('cmd_findPrev')"  modifiers="shift"/>
-  <key id="key_findTypeText"/>
-  <key id="key_findTypeLinks"/>
   <key id="key_stop" keycode="VK_ESCAPE" command="cmd_stop"/>
   <keyset id="viewZoomKeys"/>
 
@@ -1045,9 +1041,6 @@ Rights Reserved.
       <menuitem label="&findCmd.label;" key="key_find" accesskey="&findCmd.accesskey;" observes="cmd_find"/>
       <menuitem label="&findAgainCmd.label;" key="key_findAgain" accesskey="&findAgainCmd.accesskey;" observes="cmd_findAgain"/>
       <menuitem label="&findPrevCmd.label;"  key="key_findPrev"  accesskey="&findPrevCmd.accesskey;"  observes="cmd_findPrev"/>
-      <menuseparator/> 
-      <menuitem id="menu_findTypeLinks"/>
-      <menuitem id="menu_findTypeText"/>
       <menuseparator/>
       <menuitem id="menu_properties" label="&folderPropsCmd.label;"
                 accesskey="&folderPropsCmd.accesskey;"
diff --git a/xpfe/browser/resources/content/navigatorOverlay.xul b/xpfe/browser/resources/content/navigatorOverlay.xul
index 991235fd135..cee804eccde 100644
--- a/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -85,8 +85,6 @@
     <key id="key_findPrev"   key="&findPrevCmd.commandkey;"       command="Browser:FindPrev"  modifiers="accel,shift"/>
     <key keycode="&findAgainCmd.commandkey2;" command="Browser:FindAgain"/>
     <key keycode="&findPrevCmd.commandkey2;"  command="Browser:FindPrev" modifiers="shift"/>
-    <key id="key_findTypeText"/>
-    <key id="key_findTypeLinks"/>
 
     <!-- Go Menu -->
 
@@ -150,9 +148,7 @@
     <command id="Browser:Find" oncommand="BrowserFind();" observes="isImage"/>
     <command id="Browser:FindAgain" oncommand="BrowserFindAgain(false);" observes="isImage"/>
     <command id="Browser:FindPrev"  oncommand="BrowserFindAgain(true);"  observes="isImage"/>
-    <command id="cmd_findTypeText" observes="isImage"/>
-    <command id="cmd_findTypeLinks" observes="isImage"/>
-
+  
     <!-- Bookmarks Menu -->
     <command id="Browser:AddBookmark" label="&addCurPageCmd.label;" accesskey="&addCurPageCmd.accesskey;" 
              oncommand="BookmarksUtils.addBookmarkForBrowser(document.getElementById('content').webNavigation, false);"/>
@@ -235,10 +231,6 @@
         <menuitem id="menu_find" label="&findOnCmd.label;" accesskey="&findOnCmd.accesskey;" key="key_find" command="Browser:Find"/>
         <menuitem id="menu_findAgain" label="&findAgainCmd.label;" accesskey="&findAgainCmd.accesskey;" key="key_findAgain" command="Browser:FindAgain"/>
         <menuitem id="menu_findPrev"  label="&findPrevCmd.label;"  accesskey="&findPrevCmd.accesskey;" key="key_findPrev" command="Browser:FindPrev"/>
-        <menuseparator/> 
-        <menuitem id="menu_findTypeLinks"/>
-        <menuitem id="menu_findTypeText"/>
-
         <menuseparator id="menu_PrefsSeparator"/> 
         <menuitem id="menu_preferences" oncommand="goPreferences('navigator', 'chrome://communicator/content/pref/pref-navigator.xul', 'navigator')"/>
       </menupopup>
diff --git a/xpfe/browser/resources/content/viewSourceOverlay.xul b/xpfe/browser/resources/content/viewSourceOverlay.xul
index 80f4206dde4..b3518536e2e 100644
--- a/xpfe/browser/resources/content/viewSourceOverlay.xul
+++ b/xpfe/browser/resources/content/viewSourceOverlay.xul
@@ -97,10 +97,9 @@
     <key id="key_selectAll"/>
     <key id="key_find"         key="&findOnCmd.commandkey;" command="Browser:Find" modifiers="accel"/>
     <key id="key_findAgain"    key="&findAgainCmd.commandkey;" command="Browser:FindAgain" modifiers="accel"/>
-    <key id="key_findPrev"     key="&findPrevCmd.commandkey;"  command="Browser:FindPrev"  modifiers="accel, shift"/>
+    <key id="key_findNext"     key="&findPrevCmd.commandkey;"  command="Browser:FindPrev"  modifiers="accel, shift"/>
     <key keycode="&findAgainCmd.commandkey2;" command="Browser:FindAgain"/>
     <key keycode="&findPrevCmd.commandkey2;"  command="Browser:FindPrev"  modifiers="shift"/>
-    <key id="key_findTypeText"/>
 
     <keyset id="viewZoomKeys"/>
   </keyset>
@@ -161,8 +160,6 @@
                     label="&findAgainCmd.label;" accesskey="&findAgainCmd.accesskey;"/>
           <menuitem id="menu_findPrev" key="key_findPrev" command="Browser:FindPrev"
                     label="&findPrevCmd.label;" accesskey="&findPrevCmd.accesskey;"/>
-          <menuseparator/> 
-          <menuitem id="menu_findTypeText"/>
         </menupopup>
       </menu>
 
diff --git a/xpfe/communicator/resources/content/utilityOverlay.xul b/xpfe/communicator/resources/content/utilityOverlay.xul
index 6875598dcaa..53d8415e31e 100644
--- a/xpfe/communicator/resources/content/utilityOverlay.xul
+++ b/xpfe/communicator/resources/content/utilityOverlay.xul
@@ -132,16 +132,6 @@
             key="key_selectAll"
             accesskey="&selectAllCmd.accesskey;"
             command="cmd_selectAll"/>
-  <menuitem id="menu_findTypeText"
-            label="&findTypeTextCmd.label;"
-            key="key_findTypeText"
-            accesskey="&findTypeTextCmd.accesskey;"
-            command="cmd_findTypeText"/>
-  <menuitem id="menu_findTypeLinks"
-            label="&findTypeLinksCmd.label;"
-            key="key_findTypeLinks"
-            accesskey="&findTypeLinksCmd.accesskey;"
-            command="cmd_findTypeLinks"/>
 
   <!-- These key nodes are here only for show. The real bindings come from
        XBL, in platformHTMLBindings.xml. See bugs 57078 and 71779. -->
@@ -161,10 +151,6 @@
   <key id="key_paste"
        key="&pasteCmd.key;"
        modifiers="accel"/>
-  <key id="key_findTypeText"
-       key="&findTypeTextCmd.key;"/>
-  <key id="key_findTypeLinks"
-       key="&findTypeLinksCmd.key;"/>
 
   <commandset id="globalEditMenuItems"
               commandupdater="true"
@@ -214,10 +200,6 @@
   <command id="cmd_selectAll"
            oncommand="goDoCommand('cmd_selectAll')"
            disabled="true"/>
-  <command id="cmd_findTypeText" 
-           oncommand="goDoCommand('cmd_findTypeText')"/>
-  <command id="cmd_findTypeLinks" 
-           oncommand="goDoCommand('cmd_findTypeLinks')"/>
         
   <!-- Not needed yet, window will need this: -->
   <!-- broadcaster id="cmd_preferences"/ -->
diff --git a/xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd b/xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd
index 048e4cc04cc..2b2d9a3e032 100644
--- a/xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd
+++ b/xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd
@@ -46,12 +46,6 @@
 <!ENTITY preferencesCmd.label				"Preferences...">
 <!ENTITY preferencesCmd.key					"E">  
 <!ENTITY preferencesCmd.accesskey			"e"> 
-<!ENTITY findTypeTextCmd.label "Find Text As You Type">
-<!ENTITY findTypeTextCmd.key "/">
-<!ENTITY findTypeTextCmd.accesskey "x">
-<!ENTITY findTypeLinksCmd.label "Find Links As You Type">
-<!ENTITY findTypeLinksCmd.key "'">
-<!ENTITY findTypeLinksCmd.accesskey "k">
 
 <!ENTITY viewMenu.label					"View"> 
 <!ENTITY viewMenu.accesskey				"v">