fix position and zoom state persistence for bm-find.xul and history.xul. bug 65262 (32148) r=ben,mscott,pchen

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -802,7 +802,7 @@ Rights Reserved.
 			<menuitem value="&searchMailCmd.label;" accesskey="&searchMailCmd.accesskey;" oncommand="MsgSearchMessages();"/>
 			<menuseparator/>
 			<menuitem value="&searchInternetCmd.label;" accesskey="&searchInternetCmd.accesskey;" oncommand="openTopWin('http://home.netscape.com/bookmark/6_0/ssearch.html')"/>
-			<menuitem value="&searchBookmarksCmd.label;" accesskey="&searchBookmarksCmd.accesskey;" oncommand="window.openDialog('chrome://communicator/content/bookmarks/bm-find.xul', 'FindBookmarksWindow', 'centerscreen,dialog=no,close,chrome,resizable');"/>
+			<menuitem value="&searchBookmarksCmd.label;" accesskey="&searchBookmarksCmd.accesskey;" oncommand="window.openDialog('chrome://communicator/content/bookmarks/bm-find.xul', 'FindBookmarksWindow', 'dialog=no,close,chrome,resizable');"/>
 		</menupopup>
 	</menu>
 	<menu value="&goMenu.label;" accesskey="&goMenu.accesskey;">

xpfe/browser/resources/content/navigatorOverlay.xul

@@ -273,7 +273,7 @@ oncommand="goPreferences('pref-themes.xul','chrome://communicator/content/pref/p
        <menuitem accesskey="&findAgainCmd.accesskey;" key="key_findAgain" observes="Browser:FindAgain"/>
        <menuseparator />
       <menuitem value="&searchInternetCmd.label;" accesskey="&searchInternetCmd.accesskey;" oncommand="loadXURL('urn:clienturl:srchmenu:srchinternet');"/>      	
-      <menuitem value="&searchBookmarksHistoryCmd.label;" accesskey="&searchBookmarksHistoryCmd.accesskey;" oncommand="window.openDialog('chrome://communicator/content/bookmarks/bm-find.xul', 'FindBookmarksWindow', 'centerscreen,dialog=no,close,chrome,resizable');"/>
+      <menuitem value="&searchBookmarksHistoryCmd.label;" accesskey="&searchBookmarksHistoryCmd.accesskey;" oncommand="window.openDialog('chrome://communicator/content/bookmarks/bm-find.xul', 'FindBookmarksWindow', 'dialog=no,close,chrome,resizable');"/>
       <menuseparator />
        <menu value="&searchOptions.label;">
        	  <menupopup>

xpfe/components/bookmarks/resources/bm-find.js

@@ -52,27 +52,6 @@ function doLoad()
 	findText.focus();
 }
 
-
-
-function doUnload()
-{
-    // Get the current window position/size.
-    var x = window.screenX;
-    var y = window.screenY;
-    var h = window.outerHeight;
-    var w = window.outerWidth;
-
-    // Store these into the window attributes (for persistence).
-    var win = document.getElementById( "bookmark-find-window" );
-    win.setAttribute( "x", x );
-    win.setAttribute( "y", y );
-    win.setAttribute( "height", h );
-    win.setAttribute( "width", w );
-}
-
-
-
-
 var	gDatasourceName = "";
 var	gMatchName = "";
 var	gMethodName = "";

xpfe/components/bookmarks/resources/bm-find.xul

@@ -40,9 +40,11 @@
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns:web="http://home.netscape.com/WEB-rdf#"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	width="630" height="400" x="20" y="20" persist="width height x y" orient="vertical"
+	orient="vertical"
+	width="630" height="400"
+	persist="width height screenX screenY sizemode"
 	windowtype="bookmarks:find"
-	onload="doLoad()" onunload="doUnload()"
+	onload="doLoad()"
 	>
 
 	<script src="chrome://communicator/content/bookmarks/bm-find.js" />

xpfe/components/bookmarks/resources/bookmarks.js

@@ -566,7 +566,7 @@ function OpenBookmarksFind()
 {
     window.openDialog("chrome://communicator/content/bookmarks/bm-find.xul",
                       "FindBookmarksWindow",
-                      "centerscreen,dialog=no,close,chrome,resizable");
+                      "dialog=no,close,chrome,resizable");
     return true;
 }
 

xpfe/components/history/resources/history.xul

@@ -38,7 +38,8 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:web="http://home.netscape.com/WEB-rdf#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  width="500" height="400" x="20" y="20" persist="width height x y" 
+  width="500" height="400"
+  persist="width height screenX screenY sizemode"
   orient="vertical"
   windowtype="history:manager">
 
@@ -112,7 +113,7 @@
       <menuseparator/>
       <menuitem id="menu_selectAll"/>
       <menuseparator/>
-      <menuitem value="&findHisCmd.label;" accesskey="&findHisCmd.accesskey;" oncommand="window.openDialog('chrome://communicator/content/bookmarks/bm-find.xul', 'FindBookmarksWindow', 'centerscreen,dialog=no,close,chrome,resizable');"/>
+      <menuitem value="&findHisCmd.label;" accesskey="&findHisCmd.accesskey;" oncommand="window.openDialog('chrome://communicator/content/bookmarks/bm-find.xul', 'FindBookmarksWindow', 'dialog=no,close,chrome,resizable');"/>
     </menupopup>
   </menu>
   <menu id="menu_View">