Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for 128815 - numerous bookmarks improvements, including fixes for bugs: 77411, 114142, 126748, 128571.

Browse Source 
r=blake, sr=hyatt, a=asa


git-svn-id: svn://10.0.0.236/trunk@225800 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ben%netscape.com
2007-05-05 04:35:25 +00:00
parent 5991ac243a
commit 252f56adfb
4 changed files with 145 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/suite/common/bookmarks/addBookmark.js
View File

@@ -234,7 +234,7 @@ function onOK()
catch (e) {
}
kBMS.createBookmarkEx(gFld_Name.value, url, gBookmarkCharset, rFolder, -1);
kBMS.createBookmarkWithDetails(gFld_Name.value, url, gBookmarkCharset, rFolder, -1);
}
}

2
mozilla/suite/common/bookmarks/bm-panel.xul
View File

@@ -82,5 +82,5 @@
oncommand="document.getElementById('bookmarks-view').openFindDialog();"/>
</hbox>
<bookmarks-outliner id="bookmarks-view" type="single-column" flex="1"/>
<bookmarks-outliner class="sidebar" id="bookmarks-view" type="single-column" flex="1"/>
</page>

141
mozilla/suite/common/bookmarks/bookmarks.js
View File

@@ -27,16 +27,10 @@
function Startup()
{
var bookmarksView = document.getElementById("bookmarks-view");
// Set up the outliner controller
// gBookmarksShell = new nsBookmarksShell("bookmarks-outliner", "bookmarks-outlinerbody");
// var rdflinerObserver = new nsBookmarksRDFLinerObserver();
// var builder = bookmarksBody.builder.QueryInterface(Components.interfaces.nsIXULOutlinerBuilder);
// builder.addObserver(rdflinerObserver);
const windowNode = document.getElementById("bookmark-window");
// If we've been opened with a parameter, root the outliner on it.
if ("arguments" in window && window.arguments[0]) {
var uri = window.arguments[0];
dump(uri);
bookmarksView.outliner.setAttribute("ref", uri);
var title = "";
@@ -99,14 +93,135 @@ function sendBookmarksLink()
outliner.sendLink();
}
function importIEFavorites()
var gConstructedViewMenuSortItems = false;
function fillViewMenu(aEvent)
{
var bookmarksView = document.getElementById("bookmarks-view");
var RDFS = bookmarksView.rdf;
var adjacentElement = document.getElementById("fill-before-this-node");
var popupElement = aEvent.target;
var BMDS = bookmarksView.bookmarksDS;
var BMSvc = BMDS.QueryInterface(Components.interfaces.nsIBookmarksService);
var favFolder = BMSvc.createFolder("Imported IE Favorites", RDFS.GetResource("NC:BookmarksRoot"));
BMSvc.importSystemBookmarks(favFolder)
var bookmarksView = document.getElementById("bookmarks-view");
var columns = bookmarksView.columns;
if (!gConstructedViewMenuSortItems) {
for (var i = 0; i < columns.length; ++i) {
var name = columns[i].name;
var accesskey = columns[i].accesskey;
var menuitem = document.createElement("menuitem");
var nameTemplate = bookmarksView._bundle.GetStringFromName("SortMenuItem");
var name = nameTemplate.replace(/%NAME%/g, columns[i].label);
menuitem.setAttribute("label", name);
menuitem.setAttribute("accesskey", columns[i].accesskey);
menuitem.setAttribute("resource", columns[i].resource);
menuitem.setAttribute("id", "sortMenuItem:" + columns[i].resource);
menuitem.setAttribute("checked", columns[i].sortActive);
menuitem.setAttribute("name", "sortSet");
menuitem.setAttribute("type", "radio");
popupElement.insertBefore(menuitem, adjacentElement);
}
gConstructedViewMenuSortItems = true;
}
const kPrefSvcContractID = "@mozilla.org/preferences;1";
const kPrefSvcIID = Components.interfaces.nsIPrefService;
var prefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
var bookmarksSortPrefs = prefSvc.getBranch("browser.bookmarks.sort.");
if (gConstructedViewMenuSortItems) {
var resource = bookmarksSortPrefs.getCharPref("resource");
var element = document.getElementById("sortMenuItem:" + resource);
if (element)
element.setAttribute("checked", "true");
}
var sortAscendingMenu = document.getElementById("ascending");
var sortDescendingMenu = document.getElementById("descending");
var noSortMenu = document.getElementById("natural");
sortAscendingMenu.setAttribute("checked", "false");
sortDescendingMenu.setAttribute("checked", "false");
noSortMenu.setAttribute("checked", "false");
var direction = bookmarksSortPrefs.getCharPref("direction");
if (direction == "natural")
sortAscendingMenu.setAttribute("checked", "true");
else if (direction == "ascending")
sortDescendingMenu.setAttribute("checked", "true");
else
noSortMenu.setAttribute("checked", "true");
}
function onViewMenuSortItemSelected(aEvent)
{
var resource = aEvent.target.getAttribute("resource");
const kPrefSvcContractID = "@mozilla.org/preferences;1";
const kPrefSvcIID = Components.interfaces.nsIPrefService;
var prefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
var bookmarksSortPrefs = prefSvc.getBranch("browser.bookmarks.sort.");
switch (resource) {
case "":
break;
case "direction":
var dirn = bookmarksSortPrefs.getCharPref("direction");
if (aEvent.target.id == "ascending")
bookmarksSortPrefs.setCharPref("direction", "natural");
else if (aEvent.target.id == "descending")
bookmarksSortPrefs.setCharPref("direction", "ascending");
else
bookmarksSortPrefs.setCharPref("direction", "descending");
break;
default:
bookmarksSortPrefs.setCharPref("resource", resource);
var direction = bookmarksSortPrefs.getCharPref("direction");
if (direction == "descending")
bookmarksSortPrefs.setCharPref("direction", "natural");
break;
}
aEvent.preventCapture();
}
var gConstructedColumnsMenuItems = false;
function fillColumnsMenu(aEvent)
{
var bookmarksView = document.getElementById("bookmarks-view");
var columns = bookmarksView.columns;
if (!gConstructedColumnsMenuItems) {
for (var i = 0; i < columns.length; ++i) {
var menuitem = document.createElement("menuitem");
menuitem.setAttribute("label", columns[i].label);
menuitem.setAttribute("resource", columns[i].resource);
menuitem.setAttribute("id", "columnMenuItem:" + columns[i].resource);
menuitem.setAttribute("type", "checkbox");
menuitem.setAttribute("checked", columns[i].hidden != "true");
aEvent.target.appendChild(menuitem);
}
gConstructedColumnsMenuItems = true;
}
else {
for (var i = 0; i < columns.length; ++i) {
var element = document.getElementById("columnMenuItem:" + columns[i].resource);
if (element && columns[i].hidden != "true")
element.setAttribute("checked", "true");
}
}
aEvent.preventBubble();
}
function onViewMenuColumnItemSelected(aEvent)
{
var resource = aEvent.target.getAttribute("resource");
if (resource != "") {
var bookmarksView = document.getElementById("bookmarks-view");
bookmarksView.toggleColumnVisibility(resource);
}
aEvent.preventBubble();
}

22
mozilla/suite/locales/en-US/chrome/common/bookmarks/bookmarks.dtd
View File

@@ -66,12 +66,20 @@
<!ENTITY menuitem.personaltoolbarfolder.label "Set as Personal Toolbar Folder">
<!ENTITY menuitem.personaltoolbarfolder.accesskey "p">
<!ENTITY outlinercol.name.label "Name">
<!ENTITY outlinercol.url.label "Location">
<!ENTITY outlinercol.shortcut.label "Keyword">
<!ENTITY outlinercol.addedon.label "Added">
<!ENTITY outlinercol.lastmod.label "Last Modified">
<!ENTITY outlinercol.lastvisit.label "Last Visited">
<!ENTITY outlinercol.description.label "Description">
<!ENTITY outlinercol.name.label "Name">
<!ENTITY outlinercol.name.accesskey "n">
<!ENTITY outlinercol.url.label "Location">
<!ENTITY outlinercol.url.accesskey "l">
<!ENTITY outlinercol.shortcut.label "Keyword">
<!ENTITY outlinercol.shortcut.accesskey "k">
<!ENTITY outlinercol.addedon.label "Added">
<!ENTITY outlinercol.addedon.accesskey "a">
<!ENTITY outlinercol.lastmod.label "Last Modified">
<!ENTITY outlinercol.lastmod.accesskey "m">
<!ENTITY outlinercol.lastvisit.label "Last Visited">
<!ENTITY outlinercol.lastvisit.accesskey "b">
<!ENTITY outlinercol.description.label "Description">
<!ENTITY outlinercol.description.accesskey "d">
<!ENTITY bookmarksWindowTitle.label "Bookmarks">