mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-08 04:27:37 +00:00
73f6674801
Stop caching the result of shouldLoadTabInBackground(), there's no point since we need to look at the state of the shift key every time, and we didn't update it in all code paths to begin with. Pass in |event| from more places in history and bookmarks so we'll actually look at te shift key. Replace use of "tab_background" with looking at shouldLoadTabInBackground(). r=IanN, sr=Neil
164 lines
9.0 KiB
XML
164 lines
9.0 KiB
XML
<?xml version="1.0"?>
|
|
<!--
|
|
|
|
***** BEGIN LICENSE BLOCK *****
|
|
Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
|
|
|
The contents of this file are subject to the Mozilla Public License Version
|
|
1.1 (the "License"); you may not use this file except in compliance with
|
|
the License. You may obtain a copy of the License at
|
|
http://www.mozilla.org/MPL/
|
|
|
|
Software distributed under the License is distributed on an "AS IS" basis,
|
|
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
|
for the specific language governing rights and limitations under the
|
|
License.
|
|
|
|
The Original Code is mozilla.org code.
|
|
|
|
The Initial Developer of the Original Code is
|
|
Netscape Communications Corporation.
|
|
Portions created by the Initial Developer are Copyright (C) 1998
|
|
the Initial Developer. All Rights Reserved.
|
|
|
|
Contributor(s):
|
|
Ben Goodger <ben@netscape.com>
|
|
Blake Ross <blakeross@telocity.com>
|
|
Alec Flett <alecf@netscape.com>
|
|
|
|
Alternatively, the contents of this file may be used under the terms of
|
|
either of the GNU General Public License Version 2 or later (the "GPL"),
|
|
or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
|
in which case the provisions of the GPL or the LGPL are applicable instead
|
|
of those above. If you wish to allow use of your version of this file only
|
|
under the terms of either the GPL or the LGPL, and not to allow others to
|
|
use your version of this file under the terms of the MPL, indicate your
|
|
decision by deleting the provisions above and replace them with the notice
|
|
and other provisions required by the GPL or the LGPL. If you do not delete
|
|
the provisions above, a recipient may use your version of this file under
|
|
the terms of any one of the MPL, the GPL or the LGPL.
|
|
|
|
***** END LICENSE BLOCK ***** -->
|
|
|
|
<!DOCTYPE overlay [
|
|
<!ENTITY % historyDTD SYSTEM "chrome://communicator/locale/history/historyTreeOverlay.dtd" >
|
|
%historyDTD;
|
|
<!ENTITY % contentAreaCommandsDTD SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
|
|
%contentAreaCommandsDTD;
|
|
]>
|
|
<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>
|
|
|
|
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
|
|
|
|
<overlay id="historyTreeOverlay"
|
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
|
xmlns:web="http://home.netscape.com/WEB-rdf#"
|
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
|
|
|
|
<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
|
|
<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
|
|
<script type="application/x-javascript" src="chrome://global/content/nsTreeController.js"/>
|
|
<script type="application/x-javascript" src="chrome://global/content/nsTreeSorting.js"/>
|
|
<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
|
|
<script type="application/x-javascript" src="chrome://communicator/content/history/history.js"/>
|
|
<script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
|
|
|
|
<popupset id="historyContextMenu">
|
|
<command id="cmd_selectAll"/>
|
|
<command id="cmd_cut"/>
|
|
<command id="cmd_copy"/>
|
|
<command id="cmd_delete"/>
|
|
<command id="cmd_selectAll"/>
|
|
<popup id="historyMenu" onpopupshowing="return updateItems();">
|
|
<menuitem id="miCollapseExpand" oncommand="collapseExpand();"/>
|
|
<menuitem id="miOpen" label="&openLinkInWindowCmd.label;" accesskey="&openLinkInWindowCmd.accesskey;" default="true"
|
|
oncommand="OpenURL('current');"/>
|
|
<menuitem id="miOpenInNewWindow" label="&openLinkCmd.label;" accesskey="&openLinkCmd.accesskey;"
|
|
oncommand="OpenURL('window');"/>
|
|
<menuitem id="miOpenInNewTab" label="&openLinkCmdInTab.label;" accesskey="&openLinkCmdInTab.accesskey;"
|
|
oncommand="OpenURL('tab', event);"/>
|
|
<menuseparator id="pre-bookmarks-separator"/>
|
|
<menuitem id="miAddBookmark" label="&bookmarkLinkCmd.label;" accesskey="&bookmarkLinkCmd.accesskey;" oncommand="historyAddBookmarks();"/>
|
|
<menuitem id="miCopyLinkLocation" label="©LinkCmd.label;" accesskey="©LinkCmd.accesskey;"
|
|
command="cmd_copy"/>
|
|
<menuseparator id="post-bookmarks-separator"/>
|
|
<menuitem id="miDelete" label="&deleteCmd.label;" accesskey="&deleteCmd.accesskey;"
|
|
command="cmd_delete"/>
|
|
<menuitem id="miSelectAll" label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
|
|
command="cmd_selectAll"/>
|
|
</popup>
|
|
<data id="multipleBookmarks" label="&bookmarkLinksCmd.label;" accesskey="&bookmarkLinksCmd.akey;"/>
|
|
<data id="oneBookmark" label="&bookmarkLinkCmd.label;" accesskey="&bookmarkLinkCmd.accesskey;"/>
|
|
</popupset>
|
|
<tree id="historyTree" flex="1" enableColumnDrag="true" class="plain"
|
|
context="historyMenu"
|
|
datasources="rdf:history" ref="NC:HistoryByDate" flags="dont-build-content"
|
|
onkeypress="if (event.keyCode == 13) OpenURL(BookmarksUtils.getBrowserTargetFromEvent(event), event);"
|
|
onselect="this.view.selectionChanged();
|
|
historyOnSelect();"
|
|
onclick="historyOnClick(event);"
|
|
ondraggesture="if (event.originalTarget.localName == 'treechildren') nsDragAndDrop.startDrag(event, historyDNDObserver);"
|
|
ondblclick="if (validClickConditions(event)) OpenURL(BookmarksUtils.getBrowserTargetFromEvent(event), event);">
|
|
<template>
|
|
<rule>
|
|
<treechildren>
|
|
<treeitem uri="rdf:*" rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
|
|
<treerow>
|
|
<treecell label="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
|
<treecell label="rdf:http://home.netscape.com/NC-rdf#URL"/>
|
|
<treecell label="rdf:http://home.netscape.com/NC-rdf#Date"/>
|
|
<treecell label="rdf:http://home.netscape.com/NC-rdf#FirstVisitDate"/>
|
|
<treecell label="rdf:http://home.netscape.com/NC-rdf#Hostname" />
|
|
<treecell label="rdf:http://home.netscape.com/NC-rdf#Referrer"/>
|
|
<treecell label="rdf:http://home.netscape.com/NC-rdf#VisitCount"/>
|
|
</treerow>
|
|
</treeitem>
|
|
</treechildren>
|
|
</rule>
|
|
</template>
|
|
<treecols id="historyTreeCols">
|
|
<treecol flex="4" id="Name" persist="hidden width sortActive sortDirection ordinal"
|
|
label="&tree.header.name.label;" primary="true"
|
|
sort="rdf:http://home.netscape.com/NC-rdf#Name"
|
|
accesskey="&tree.header.name.akey;"
|
|
class="sortDirectionIndicator"/>
|
|
<splitter class="tree-splitter" id="pre-URL-splitter"/>
|
|
<treecol flex="4" id="URL"
|
|
persist="hidden width sortActive sortDirection ordinal"
|
|
label="&tree.header.url.label;" class="sortDirectionIndicator"
|
|
accesskey="&tree.header.url.akey;"
|
|
sort="rdf:http://home.netscape.com/NC-rdf#URL"/>
|
|
<splitter class="tree-splitter" id="pre-Date-splitter"/>
|
|
<treecol flex="1" id="Date"
|
|
persist="hidden width sortActive sortDirection ordinal"
|
|
label="&tree.header.date.label;" class="sortDirectionIndicator"
|
|
accesskey="&tree.header.date.akey;"
|
|
sort="rdf:http://home.netscape.com/NC-rdf#Date"/>
|
|
<splitter class="tree-splitter" id="pre-FirstVisitDate-splitter"/>
|
|
<treecol flex="1" id="FirstVisitDate" hidden="true"
|
|
persist="hidden width sortActive sortDirection ordinal"
|
|
label="&tree.header.firstvisitdate.label;" class="sortDirectionIndicator"
|
|
accesskey="&tree.header.firstvisitdate.akey;"
|
|
sort="rdf:http://home.netscape.com/NC-rdf#FirstVisitDate"/>
|
|
<splitter class="tree-splitter" id="pre-Hostname-splitter"/>
|
|
<treecol flex="1" id="Hostname" hidden="true"
|
|
persist="hidden width sortActive sortDirection ordinal"
|
|
label="&tree.header.hostname.label;" class="sortDirectionIndicator"
|
|
accesskey="&tree.header.hostname.akey;"
|
|
sort="rdf:http://home.netscape.com/NC-rdf#Hostname"/>
|
|
<splitter class="tree-splitter" id="pre-Referrer-splitter"/>
|
|
<treecol flex="1" id="Referrer" hidden="true"
|
|
persist="hidden width sortActive sortDirection ordinal"
|
|
label="&tree.header.referrer.label;" class="sortDirectionIndicator"
|
|
accesskey="&tree.header.referrer.akey;"
|
|
sort="rdf:http://home.netscape.com/NC-rdf#Referrer"/>
|
|
<splitter class="tree-splitter" id="pre-VisitCount-splitter"/>
|
|
<treecol flex="1" id="VisitCount" hidden="true"
|
|
persist="hidden width sortActive sortDirection ordinal"
|
|
label="&tree.header.visitcount.label;" class="sortDirectionIndicator"
|
|
accesskey="&tree.header.visitcount.akey;"
|
|
sort="rdf:http://home.netscape.com/NC-rdf#VisitCount"/>
|
|
</treecols>
|
|
</tree>
|
|
</overlay>
|