зеркало из https://github.com/mozilla/pjs.git
Fix for bug 199524. File bookmark... dialog no longer resizable
r=jag, sr=peterv
This commit is contained in:
Родитель
50c5f629a2
Коммит
5c3aa15c4b
|
@ -322,3 +322,14 @@ function toggleGroup()
|
||||||
gFld_Name.focus();
|
gFld_Name.focus();
|
||||||
onFieldInput();
|
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");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
ondialogaccept="return onOK(event)"
|
ondialogaccept="return onOK(event)"
|
||||||
title="&newBookmark.title;" selectFolderTitle="&selectFolder.title;"
|
title="&newBookmark.title;" selectFolderTitle="&selectFolder.title;"
|
||||||
onload="Startup();"
|
onload="Startup();"
|
||||||
|
onunload="persistTreeSize();"
|
||||||
persist="screenX screenY"
|
persist="screenX screenY"
|
||||||
screenX="24" screenY="24">
|
screenX="24" screenY="24">
|
||||||
|
|
||||||
|
@ -94,7 +95,8 @@
|
||||||
<vbox id="folderbox" flex="1">
|
<vbox id="folderbox" flex="1">
|
||||||
<label id="destinationLabel" value="&destination.label;"/>
|
<label id="destinationLabel" value="&destination.label;"/>
|
||||||
<bookmarks-tree id="bookmarks-view" flex="1" type="folders"
|
<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"/>
|
<separator id="folderbuttonseparator" class="thin"/>
|
||||||
|
|
||||||
|
|
|
@ -505,7 +505,7 @@ var BookmarksCommand = {
|
||||||
{
|
{
|
||||||
var rv = { selectedFolder: null };
|
var rv = { selectedFolder: null };
|
||||||
openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "",
|
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)
|
if (!rv.target)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -894,7 +894,7 @@ var BookmarksController = {
|
||||||
var folder = aTarget.parent.Value;
|
var folder = aTarget.parent.Value;
|
||||||
var rv = { newBookmark: null };
|
var rv = { newBookmark: null };
|
||||||
openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "",
|
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;
|
break;
|
||||||
case "cmd_bm_newseparator":
|
case "cmd_bm_newseparator":
|
||||||
BookmarksCommand.createNewSeparator(aTarget);
|
BookmarksCommand.createNewSeparator(aTarget);
|
||||||
|
@ -1506,7 +1506,7 @@ var BookmarksUtils = {
|
||||||
}
|
}
|
||||||
|
|
||||||
openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "",
|
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.name, currentTabInfo.url, null,
|
||||||
currentTabInfo.charset, "addGroup" + (aSelect ? ",group" : ""), tabsInfo);
|
currentTabInfo.charset, "addGroup" + (aSelect ? ",group" : ""), tabsInfo);
|
||||||
},
|
},
|
||||||
|
@ -1541,7 +1541,7 @@ var BookmarksUtils = {
|
||||||
|
|
||||||
if (aShowDialog) {
|
if (aShowDialog) {
|
||||||
openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "",
|
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 {
|
else {
|
||||||
// User has elected to override the file dialog and always file bookmarks
|
// User has elected to override the file dialog and always file bookmarks
|
||||||
|
|
Загрузка…
Ссылка в новой задаче