From 67d8581b54de700c0b5b442c0c22b4d794264d7a Mon Sep 17 00:00:00 2001
From: "varga%netscape.com" <varga%netscape.com>
Date: Sat, 5 May 2007 04:36:12 +0000
Subject: [PATCH] Fix for bug 199524. File bookmark... dialog no longer
 resizable r=jag, sr=peterv

---
 suite/common/bookmarks/addBookmark.js  | 11 +++++++++++
 suite/common/bookmarks/addBookmark.xul |  4 +++-
 suite/common/bookmarks/bookmarks.js    |  8 ++++----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/suite/common/bookmarks/addBookmark.js b/suite/common/bookmarks/addBookmark.js
index ee7bbf6edeb..1841815cd58 100644
--- a/suite/common/bookmarks/addBookmark.js
+++ b/suite/common/bookmarks/addBookmark.js
@@ -322,3 +322,14 @@ function toggleGroup()
   gFld_Name.focus();
   onFieldInput();
 }
+
+function persistTreeSize()
+{
+  if (!document.getElementById("folderbox").hidden) {
+    var bookmarkView = document.getElementById("bookmarks-view");
+    bookmarkView.setAttribute("height", bookmarkView.boxObject.height);
+    document.persist("bookmarks-view", "height");
+    bookmarkView.setAttribute("width", bookmarkView.boxObject.width);
+    document.persist("bookmarks-view", "width");
+  }
+}
diff --git a/suite/common/bookmarks/addBookmark.xul b/suite/common/bookmarks/addBookmark.xul
index 495ee5c2c32..dca127b94a8 100644
--- a/suite/common/bookmarks/addBookmark.xul
+++ b/suite/common/bookmarks/addBookmark.xul
@@ -41,6 +41,7 @@
         ondialogaccept="return onOK(event)"
         title="&newBookmark.title;" selectFolderTitle="&selectFolder.title;"
         onload="Startup();"
+        onunload="persistTreeSize();"
         persist="screenX screenY"
         screenX="24" screenY="24">
    
@@ -94,7 +95,8 @@
   <vbox id="folderbox" flex="1">
     <label id="destinationLabel" value="&destination.label;"/>
     <bookmarks-tree id="bookmarks-view" flex="1" type="folders"
-                    rows="10" seltype="single"/>
+                    rows="10" seltype="single"
+                    persist="width height"/>
 
     <separator id="folderbuttonseparator" class="thin"/>
 
diff --git a/suite/common/bookmarks/bookmarks.js b/suite/common/bookmarks/bookmarks.js
index 353acb57b7c..7eeaec48dcc 100644
--- a/suite/common/bookmarks/bookmarks.js
+++ b/suite/common/bookmarks/bookmarks.js
@@ -505,7 +505,7 @@ var BookmarksCommand = {
   {
     var rv = { selectedFolder: null };      
     openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
-               "centerscreen,chrome,modal=yes,dialog=yes,resizable=no", null, null, null, null, "selectFolder", rv);
+               "centerscreen,chrome,modal=yes,dialog=yes,resizable=yes", null, null, null, null, "selectFolder", rv);
     if (!rv.target)
       return;
     
@@ -894,7 +894,7 @@ var BookmarksController = {
       var folder = aTarget.parent.Value;
       var rv = { newBookmark: null };
       openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
-                 "centerscreen,chrome,modal=yes,dialog=yes,resizable=no", null, null, folder, null, "newBookmark", rv);
+                 "centerscreen,chrome,modal=yes,dialog=yes,resizable=yes", null, null, folder, null, "newBookmark", rv);
       break;
     case "cmd_bm_newseparator":
       BookmarksCommand.createNewSeparator(aTarget);
@@ -1506,7 +1506,7 @@ var BookmarksUtils = {
     }
 
     openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "",
-               "centerscreen,chrome,dialog=yes,resizable=no,dependent",
+               "centerscreen,chrome,dialog=yes,resizable=yes,dependent",
                currentTabInfo.name, currentTabInfo.url, null,
                currentTabInfo.charset, "addGroup" + (aSelect ? ",group" : ""), tabsInfo);
   },
@@ -1541,7 +1541,7 @@ var BookmarksUtils = {
 
     if (aShowDialog) {
       openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "",
-                 "centerscreen,chrome,dialog=yes,resizable=no,dependent", aTitle, aURL, null, aCharset);
+                 "centerscreen,chrome,dialog=yes,resizable=yes,dependent", aTitle, aURL, null, aCharset);
     }
     else {
       // User has elected to override the file dialog and always file bookmarks