mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

- move bookmarks over to the generic nsTreeUtils.js for stuff like sorting/menus 

- convert history to use the new nsTreeController
- update history to support removing of individual items (bug #11412)
a=ben
This commit is contained in:
alecf%netscape.com 2000-12-21 21:59:39 +00:00
Родитель ecb1018b7d
Коммит 4e1dababf6
6 изменённых файлов: 13 добавлений и 464 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
xpfe/components/bookmarks/resources/bm-panel.xul
Просмотреть файл

@ -38,6 +38,7 @@
<script src="chrome://communicator/content/bookmarks/bm-panel.js" />
<script src="chrome://communicator/content/bookmarks/bookmarks.js" />
<script src="chrome://communicator/content/bookmarks/bookmarksDD.js"/>
<script src="chrome://global/content/nsTreeUtils.js"/>
<script src="chrome://global/content/strres.js"/>
<script src="chrome://global/content/nsJSComponentManager.js"/>

413
xpfe/components/bookmarks/resources/bookmarks.js
Просмотреть файл

@ -637,413 +637,6 @@ function OpenURL(event, node, root)
return true;
}
function update_sort_menuitems(column, direction)
{
var unsorted_menuitem = document.getElementById("unsorted_menuitem");
var sort_ascending = document.getElementById('sort_ascending');
var sort_descending = document.getElementById('sort_descending');
// as this function may be called from various places, including the
// bookmarks sidebar panel (which doesn't have any menu items)
// ensure that the document contains the elements
if ((!unsorted_menuitem) || (!sort_ascending) || (!sort_descending))
return;
if (direction == "natural") {
unsorted_menuitem.setAttribute('checked','true');
sort_ascending.setAttribute('disabled','true');
sort_descending.setAttribute('disabled','true');
sort_ascending.removeAttribute('checked');
sort_descending.removeAttribute('checked');
} else {
sort_ascending.removeAttribute('disabled');
sort_descending.removeAttribute('disabled');
if (direction == "ascending") {
sort_ascending.setAttribute('checked','true');
} else {
sort_descending.setAttribute('checked','true');
}
var columns = document.getElementById('theColumns');
var column_node = columns.firstChild;
var column_name = column.id;
var menuitem = document.getElementById('fill_after_this_node');
menuitem = menuitem.nextSibling
while (1) {
var name = menuitem.getAttribute('column_id');
debug("update: "+name)
if (!name) break;
if (column_name == name) {
menuitem.setAttribute('checked', 'true');
break;
}
menuitem = menuitem.nextSibling;
column_node = column_node.nextSibling;
if (column_node && column_node.tagName == "splitter")
column_node = column_node.nextSibling;
}
}
enable_sort_menuitems();
}
function enable_sort_menuitems() {
var columns = document.getElementById('theColumns');
var column_node = columns.firstChild;
var head = document.getElementById('headRow');
var tree_column = head.firstChild;
var skip_column = document.getElementById('popupCell');
var menuitem = document.getElementById('fill_after_this_node');
menuitem = menuitem.nextSibling
while (column_node) {
if (skip_column != tree_column) {
if ("true" == column_node.getAttribute("hidden")) {
menuitem.setAttribute("disabled", "true");
} else {
menuitem.removeAttribute("disabled");
}
}
menuitem = menuitem.nextSibling;
tree_column = tree_column.nextSibling;
column_node = column_node.nextSibling;
if (column_node && column_node.tagName == "splitter")
column_node = column_node.nextSibling;
}
}
function find_sort_column() {
var columns = document.getElementById('theColumns');
var column = columns.firstChild;
while (column) {
if ("true" == column.getAttribute('sortActive')) {
return column;
}
column = column.nextSibling;
}
return columns.firstChild;
}
function find_sort_direction(column) {
if ("true" == column.getAttribute('sortActive')) {
return column.getAttribute('sortDirection');
} else {
return "natural";
}
}
function SetSortDirection(direction)
{
debug("SetSortDirection("+direction+")");
var current_column = find_sort_column();
var current_direction = find_sort_direction(current_column);
if (current_direction != direction) {
sort_column(current_column, direction);
}
}
function SetSortColumn(column_name)
{
debug("SetSortColumn("+column_name+")");
var current_column = find_sort_column();
var current_direction = find_sort_direction(current_column);
var column = document.getElementById(column_name);
if (column != current_column || current_direction == "natural") {
sort_column(column, "ascending");
}
}
function TriStateColumnSort(column_name)
{
debug("TriStateColumnSort("+column_name+")");
var current_column = find_sort_column();
var current_direction = find_sort_direction(current_column);
var column = document.getElementById(column_name);
if (!column) return false;
var direction = "ascending";
if (column == current_column) {
if (current_direction == "ascending") {
direction = "descending";
} else if (current_direction == "descending") {
direction = "natural";
}
}
sort_column(column, direction);
return true;
}
function sort_column(column, direction)
{
var isupports_uri = "@mozilla.org/rdf/xul-sort-service;1";
var isupports = Components.classes[isupports_uri].getService();
if (!isupports) return false;
var xulSortService = isupports.QueryInterface(Components.interfaces.nsIXULSortService);
if (!xulSortService) return false;
try
{
var sort_resource = column.getAttribute('resource');
xulSortService.Sort(column, sort_resource, direction);
}
catch(ex)
{
debug("Exception calling xulSortService.Sort()");
}
update_sort_menuitems(column, direction);
return false;
}
function fillViewMenu(popup)
{
var fill_after = document.getElementById('fill_after_this_node');
var fill_before = document.getElementById('fill_before_this_node');
var columns = document.getElementById('theColumns');
var head = document.getElementById('headRow');
var skip_column = document.getElementById('popupCell');
if (fill_after.nextSibling == fill_before) {
var name_template = get_localized_string("SortMenuItem");
var tree_column = head.firstChild;
var column_node = columns.firstChild;
while (tree_column) {
if (skip_column != tree_column) {
// Construct an entry for each cell in the row.
var column_name = tree_column.getAttribute("value");
var item = document.createElement("menuitem");
item.setAttribute("type", "radio");
item.setAttribute("name", "sort_column");
if (column_name == "") {
column_name = tree_column.getAttribute("display");
}
var name = name_template.replace(/%NAME%/g, column_name);
var id = column_node.id;
item.setAttribute("value", name);
item.setAttribute("oncommand", "SetSortColumn('"+id+"', true);");
item.setAttribute("column_id", id);
popup.insertBefore(item, fill_before);
}
tree_column = tree_column.nextSibling;
column_node = column_node.nextSibling;
if (column_node && column_node.tagName == "splitter")
column_node = column_node.nextSibling;
}
}
var sort_column = find_sort_column();
var sort_direction = find_sort_direction(sort_column);
update_sort_menuitems(sort_column, sort_direction);
}
function fillContextMenu(name)
{
if (!name) return false;
var popupNode = document.getElementById(name);
if (!popupNode) return false;
// remove the menu node (which tosses all of its kids);
// do this in case any old command nodes are hanging around
while (popupNode.childNodes.length)
{
popupNode.removeChild(popupNode.childNodes[0]);
}
var treeNode = document.getElementById("bookmarksTree");
if (!treeNode) return false;
var db = treeNode.database;
if (!db) return false;
var compositeDB = db.QueryInterface(Components.interfaces.nsIRDFDataSource);
if (!compositeDB) return false;
var isupports_uri = "@mozilla.org/rdf/rdf-service;1";
var isupports = Components.classes[isupports_uri].getService();
if (!isupports) return false;
var rdf = isupports.QueryInterface(Components.interfaces.nsIRDFService);
if (!rdf) return false;
var target_item = document.popupNode.parentNode.parentNode;
if (target_item && target_item.nodeName == "treeitem")
{
if (target_item.getAttribute('selected') != 'true') {
treeNode.selectItem(target_item);
}
}
var select_list = treeNode.selectedItems;
debug("# of Nodes selected: " + treeNode.selectedItems.length + "\n");
var separatorResource =
rdf.GetResource(NC_NS + "BookmarkSeparator");
if (!separatorResource) return false;
// perform intersection of commands over selected nodes
var cmdArray = new Array();
var selectLength = select_list.length;
if (selectLength == 0) selectLength = 1;
for (var nodeIndex=0; nodeIndex < selectLength; nodeIndex++)
{
var id = null;
// If nothing is selected, get commands for the "ref"
// of the bookmarks root
if (select_list.length == 0)
{
id = treeNode.getAttribute("ref");
if (!id) break;
}
else
{
var node = select_list[nodeIndex];
if (!node) break;
id = node.getAttribute("id");
if (!id) break;
}
var rdfNode = rdf.GetResource(id);
if (!rdfNode) break;
var cmdEnum = db.GetAllCmds(rdfNode);
if (!cmdEnum) break;
var nextCmdArray = new Array();
while (cmdEnum.hasMoreElements())
{
var cmd = cmdEnum.getNext();
if (!cmd) break;
if (nodeIndex == 0)
{
cmdArray[cmdArray.length] = cmd;
}
else
{
nextCmdArray[cmdArray.length] = cmd;
}
}
if (nodeIndex > 0)
{
// perform command intersection calculation
for (var cmdIndex = 0; cmdIndex < cmdArray.length; cmdIndex++)
{
var cmdFound = false;
for (var nextCmdIndex = 0;
nextCmdIndex < nextCmdArray.length;
nextCmdIndex++)
{
if (nextCmdArray[nextCmdIndex] == cmdArray[cmdIndex])
{
cmdFound = true;
break;
}
}
if ((cmdFound == false) && (cmdArray[cmdIndex]))
{
var cmdResource = cmdArray[cmdIndex].QueryInterface(Components.interfaces.nsIRDFResource);
if ((cmdResource) && (cmdResource != separatorResource))
{
cmdArray[cmdIndex] = null;
}
}
}
}
}
// need a resource to ask RDF for each command's name
var rdfNameResource = rdf.GetResource(NC_NS + "Name");
if (!rdfNameResource) return false;
/*
// build up menu items
if (cmdArray.length < 1) return false;
*/
var lastWasSep = false;
for (var commandIndex = 0; commandIndex < cmdArray.length; commandIndex++)
{
cmd = cmdArray[commandIndex];
if (!cmd) continue;
cmdResource = cmd.QueryInterface(Components.interfaces.nsIRDFResource);
if (!cmdResource) break;
// handle separators
if (cmdResource == separatorResource)
{
if (lastWasSep != true)
{
lastWasSep = true;
var menuItem = document.createElement("menuseparator");
popupNode.appendChild(menuItem);
}
continue;
}
lastWasSep = false;
var cmdNameNode = compositeDB.GetTarget(cmdResource, rdfNameResource,
true);
if (!cmdNameNode) break;
cmdNameLiteral = cmdNameNode.QueryInterface(Components.interfaces.nsIRDFLiteral);
if (!cmdNameLiteral) break;
cmdName = cmdNameLiteral.Value;
if (!cmdName) break;
debug("Command #" + cmdIndex + ": id='" + cmdResource.Value +
"' name='" + cmdName + "'");
var newMenuItem = document.createElement("menuitem");
newMenuItem.setAttribute("value", cmdName);
popupNode.appendChild(newMenuItem);
// Work around bug #26402 by setting "oncommand" attribute
// AFTER appending menuitem
newMenuItem.setAttribute("oncommand",
"return doContextCmd('"+cmdResource.Value+"');");
}
// strip off leading/trailing menuseparators
while (popupNode.childNodes.length > 0)
{
if (popupNode.childNodes[0].tagName != "menuseparator")
break;
popupNode.removeChild(popupNode.childNodes[0]);
}
while (popupNode.childNodes.length > 0)
{
if (popupNode.childNodes[popupNode.childNodes.length - 1].tagName != "menuseparator")
break;
popupNode.removeChild(popupNode.childNodes[popupNode.childNodes.length - 1]);
}
// if one and only one node is selected
if (treeNode.selectedItems.length == 1)
{
// and its a bookmark or a bookmark folder (there can be other types,
// not just separators, so check explicitly for what we allow)
var type = select_list[0].getAttribute("type");
if ((type == NC_NS + "Bookmark") ||
(type == NC_NS + "Folder"))
{
// then add a menu separator (if necessary)
if (popupNode.childNodes.length > 0)
{
if (popupNode.childNodes[popupNode.childNodes.length - 1].tagName != "menuseparator")
{
var menuSep = document.createElement("menuseparator");
popupNode.appendChild(menuSep);
}
}
// And then add a "Properties" menu items
var propMenuName = get_localized_string("BookmarkProperties");
var aMenuItem = document.createElement("menuitem");
aMenuItem.setAttribute("value", propMenuName);
popupNode.appendChild(aMenuItem);
// Work around bug # 26402 by setting "oncommand" attribute
// AFTER appending menuitem
aMenuItem.setAttribute("oncommand", "return BookmarkProperties();");
}
}
return true;
}
const nsIFilePicker = Components.interfaces.nsIFilePicker;
function doContextCmd(cmdName)
@ -1292,12 +885,6 @@ function bookmarkSelect()
return true;
}
function get_localized_string(name) {
var uri = "chrome://communicator/locale/bookmarks/bookmark.properties";
var bundle = srGetStrBundle(uri);
return bundle.GetStringFromName(name);
}
//*==================================================
// Handy debug routines
//==================================================

1
xpfe/components/bookmarks/resources/bookmarks.xul
Просмотреть файл

@ -46,6 +46,7 @@
<script src="chrome://communicator/content/bookmarks/bookmarks.js"/>
<script src="chrome://communicator/content/bookmarks/bookmarksDD.js"/>
<script src="chrome://global/content/nsTreeUtils.js"/>
<script src="chrome://global/content/treePopups.js"/>
<script src="chrome://global/content/strres.js"/>
<script src="chrome://global/content/globalOverlay.js"/>

56
xpfe/components/history/resources/history.js
Просмотреть файл

@ -17,7 +17,8 @@
* Copyright (C) 1998 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Contributor(s):
* Alec Flett <alecf@netscape.com>
*/
// The history window uses JavaScript in bookmarks.js too.
@ -30,58 +31,15 @@ function debug(msg)
function HistoryInit() {
var tree = document.getElementById("bookmarksTree");
debug("adding controller to tree");
tree.controllers.appendController(HistoryController);
debug("adding controller to tree\n");
var historyController = new nsTreeController(tree);
var children = document.getElementById('treechildren-bookmarks');
tree.selectItem(children.firstChild);
if (children.firstChild)
tree.selectItem(children.firstChild);
tree.focus();
}
var HistoryController = {
supportsCommand: function(command)
{
debug("history in supports with " + command);
switch(command)
{
case "cmd_copy":
case "cmd_delete":
case "cmd_selectAll":
return true;
default:
return false;
}
},
isCommandEnabled: function(command)
{
debug("history in enabled with " + command);
switch(command)
{
case "cmd_copy":
case "cmd_delete":
case "cmd_selectAll":
return true;
default:
return false;
}
},
doCommand: function(command)
{
debug("history in do with " + command);
switch(command)
{
case "cmd_copy":
doCopy();
break;
case "cmd_delete":
doDelete();
break;
case "cmd_selectAll":
doSelectAll();
break;
}
}
};
var historyDNDObserver = {
onDragStart: function (aEvent)
{

4
xpfe/components/history/resources/history.xul
Просмотреть файл

@ -34,7 +34,6 @@
<window title="&historyWindowTitle.label;" id="bookmark-window"
onload="HistoryInit();"
onunload="doUnload()"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:web="http://home.netscape.com/WEB-rdf#"
@ -43,8 +42,9 @@
orient="vertical"
windowtype="history:manager">
<script src="chrome://communicator/content/bookmarks/bookmarks.js"/>
<script src="chrome://communicator/content/history/history.js"/>
<script src="chrome://global/content/nsTreeController.js"/>
<script src="chrome://global/content/nsTreeUtils.js"/>
<script src="chrome://global/content/treePopups.js"/>
<script src="chrome://global/content/strres.js"/>
<script src="chrome://global/content/globalOverlay.js"/>

2
xpfe/global/jar.mn
Просмотреть файл

@ -25,6 +25,8 @@ toolkit.jar:
content/global/wizardOverlay.js (resources/content/wizardOverlay.js)
content/global/wizardOverlay.xul (resources/content/wizardOverlay.xul)
content/global/treePopups.js (resources/content/treePopups.js)
content/global/nsTreeController.js (resources/content/nsTreeController.js)
content/global/nsTreeUtils.js (resources/content/nsTreeUtils.js)
content/global/xulBindings.xml (resources/content/xulBindings.xml)
content/global/menulistBindings.xml (resources/content/menulistBindings.xml)
content/global/radioBindings.xml (resources/content/radioBindings.xml)