зеркало из https://github.com/mozilla/pjs.git
Bug 214754: remove "Use Default" (broken anyway) from Bookmarks Manager - Move; dialog has no title; increase the default size of the dialog; p=gavin.sharp@gmail.com, r=mconnor, a=asa
This commit is contained in:
Родитель
0eb3a54296
Коммит
378fa1e4fd
|
@ -130,8 +130,8 @@ function Startup()
|
||||||
document.getElementById("bookmarknamegrid").setAttribute("hidden", "true");
|
document.getElementById("bookmarknamegrid").setAttribute("hidden", "true");
|
||||||
document.getElementById("createinseparator").setAttribute("hidden", "true");
|
document.getElementById("createinseparator").setAttribute("hidden", "true");
|
||||||
document.getElementById("nameseparator").setAttribute("hidden", "true");
|
document.getElementById("nameseparator").setAttribute("hidden", "true");
|
||||||
sizeToContent();
|
sizeToFit();
|
||||||
document.title = document.documentElement.getAttribute("selectFolderTitle");
|
document.title = document.documentElement.getAttribute("title-selectFolder");
|
||||||
shouldSetOKButton = false;
|
shouldSetOKButton = false;
|
||||||
if (window.arguments[2])
|
if (window.arguments[2])
|
||||||
folderItem = RDF.GetResource(window.arguments[2]);
|
folderItem = RDF.GetResource(window.arguments[2]);
|
||||||
|
@ -295,20 +295,6 @@ function createNewFolder ()
|
||||||
BookmarksCommand.createNewFolder(target);
|
BookmarksCommand.createNewFolder(target);
|
||||||
}
|
}
|
||||||
|
|
||||||
function useDefaultFolder ()
|
|
||||||
{
|
|
||||||
var bookmarkView = document.getElementById("bookmarks-view");
|
|
||||||
var folder = BookmarksUtils.getNewBookmarkFolder();
|
|
||||||
var ind = bookmarkView.treeBuilder.getIndexOfResource(folder);
|
|
||||||
if (ind != -1) {
|
|
||||||
bookmarkView.tree.focus();
|
|
||||||
bookmarkView.treeBoxObject.view.selection.select(ind);
|
|
||||||
} else {
|
|
||||||
bookmarkView.treeBoxObject.view.selection.clearSelection();
|
|
||||||
}
|
|
||||||
gCreateInFolder = folder.Value;
|
|
||||||
}
|
|
||||||
|
|
||||||
var gOldNameValue = "";
|
var gOldNameValue = "";
|
||||||
var gOldURLValue = "";
|
var gOldURLValue = "";
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
|
|
||||||
<!DOCTYPE dialog SYSTEM "chrome://browser/locale/bookmarks/addBookmark.dtd">
|
<!DOCTYPE dialog SYSTEM "chrome://browser/locale/bookmarks/addBookmark.dtd">
|
||||||
|
|
||||||
<dialog id="newBookmarkDialog" style="width: 36em;"
|
<dialog id="newBookmarkDialog" style="width: 36em; height: 18em;"
|
||||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
ondialogaccept="return onOK(event)"
|
ondialogaccept="return onOK(event)"
|
||||||
title="&newBookmark.title;" title-selectFolder="&selectFolder.label;"
|
title="&newBookmark.title;" title-selectFolder="&selectFolder.label;"
|
||||||
|
@ -109,9 +109,6 @@
|
||||||
<vbox>
|
<vbox>
|
||||||
<button label="&button.newfolder.label;" accesskey="&button.newfolder.accesskey;"
|
<button label="&button.newfolder.label;" accesskey="&button.newfolder.accesskey;"
|
||||||
oncommand="createNewFolder();" icon="open"/>
|
oncommand="createNewFolder();" icon="open"/>
|
||||||
<button label="&button.defaultfolder.label;"
|
|
||||||
accesskey="&button.defaultfolder.accesskey;"
|
|
||||||
oncommand="useDefaultFolder();"/>
|
|
||||||
</vbox>
|
</vbox>
|
||||||
</hbox>
|
</hbox>
|
||||||
</hbox>
|
</hbox>
|
||||||
|
|
|
@ -18,8 +18,6 @@
|
||||||
<!ENTITY alwayscreateinfolder.label "Don't show this dialog again">
|
<!ENTITY alwayscreateinfolder.label "Don't show this dialog again">
|
||||||
<!ENTITY alwayscreateinfolder.accesskey "a">
|
<!ENTITY alwayscreateinfolder.accesskey "a">
|
||||||
<!ENTITY dontshowmessage.tooltip "When this option is selected, new Bookmarks will be added using the title provided by the page.">
|
<!ENTITY dontshowmessage.tooltip "When this option is selected, new Bookmarks will be added using the title provided by the page.">
|
||||||
<!ENTITY button.defaultfolder.label "Use Default">
|
|
||||||
<!ENTITY button.defaultfolder.accesskey "d">
|
|
||||||
<!ENTITY selectFolder.label "Choose Folder">
|
<!ENTITY selectFolder.label "Choose Folder">
|
||||||
|
|
||||||
<!ENTITY expanderDown.tooltip "Show all the bookmarks folders">
|
<!ENTITY expanderDown.tooltip "Show all the bookmarks folders">
|
||||||
|
|
Загрузка…
Ссылка в новой задаче