blocker 126704 - can't load history items. removing some unnecessary code.

This commit is contained in:
ben%netscape.com 2002-02-20 20:55:28 +00:00
parent f124320735
commit 099bafaaab
4 changed files with 8 additions and 13 deletions

View File

@ -22,9 +22,10 @@
-->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebarListView.css" type="text/css"?>
<?xul-overlay href="chrome://communicator/content/history/historyTreeOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
<?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebarListView.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://communicator/locale/history/history.dtd" >
@ -41,8 +42,7 @@
</keyset>
<popupset id="historyContextMenu"/>
<!-- use deep merging to hide certain columns by default -->
<outliner id="historyOutliner" clickcount="1"
onclick="if (event.button == 0) OpenURL(event.ctrlKey || event.metaKey);">
<outliner id="historyOutliner">
<outlinercols id="historyOutlinerCols">
<outlinercol id="Name"/>
<splitter id="pre-URL-splitter"/>

View File

@ -254,13 +254,8 @@ function collapseExpand()
function OpenURL(aInNewWindow)
{
var currentIndex = gHistoryOutliner.currentIndex;
if (isContainer(gHistoryOutliner, currentIndex)) {
if (gHistoryOutliner.getAttribute("clickcount") == "1")
gHistoryOutliner.outlinerBoxObject.view.toggleOpenState(currentIndex);
return false;
}
var currentIndex = gHistoryOutliner.currentIndex;
var builder = gHistoryOutliner.builder.QueryInterface(Components.interfaces.nsIXULOutlinerBuilder);
var url = builder.getResourceAtIndex(currentIndex).Value;
if (aInNewWindow) {

View File

@ -138,8 +138,7 @@
</menubar>
</toolbox>
<outliner id="historyOutliner"
ondblclick="if (event.button == 0) OpenURL(event.ctrlKey || event.metaKey);"/>
<outliner id="historyOutliner"/>
<statusbar id="status-bar" class="chromeclass-status">
<statusbarpanel id="statusbar-display" flex="1"/>
<statusbarpanel class="statusbarpanel-iconic" id="offline-status"/>

View File

@ -78,7 +78,8 @@
onkeypress="if (event.keyCode == 13) OpenURL(event.ctrlKey || event.metaKey);"
onselect="this.outlinerBoxObject.view.selectionChanged();
historyOnSelect();"
ondraggesture="if (event.originalTarget.localName == 'outlinerchildren') nsDragAndDrop.startDrag(event, historyDNDObserver);">
ondraggesture="if (event.originalTarget.localName == 'outlinerchildren') nsDragAndDrop.startDrag(event, historyDNDObserver);"
ondblclick="if (validClickConditions(event)) OpenURL(event.ctrlKey || event.metaKey);">
<template>
<rule>
<outlinerchildren>