зеркало из https://github.com/mozilla/pjs.git
Bug 224346 can't refresh search tab when search results appear (in advanced mode)
patch by Karsten D��sterloh <mnyromyr@tprac.de> r=timeless sr=neil
This commit is contained in:
cbiesinger%web.de
Родитель
2d9f3593da
Коммит
2116fa7a19
|
|
@ -97,7 +97,7 @@ function onLoadInternetResults()
|
|||
.getService(Components.interfaces.nsIInternetSearchService);
|
||||
iSearch.ClearResultSearchSites();
|
||||
|
||||
// the search URI is passed in as a parameter, so get it and them root the results list
|
||||
// the search URI is passed in as a parameter, so get it and then root the results list
|
||||
var searchURI = top.content.location.href;
|
||||
if (searchURI) {
|
||||
const lastSearchURIPref = "browser.search.lastMultipleSearchURI";
|
||||
|
|
@ -138,7 +138,7 @@ function doEngineClick( event, aNode )
|
|||
var html = null;
|
||||
|
||||
var resultsTree = document.getElementById("resultsList");
|
||||
var contentArea = document.getElementById("content");
|
||||
var contentArea = document.getElementById("resultsContent");
|
||||
var splitter = document.getElementById("results-splitter");
|
||||
var engineURI = aNode.id;
|
||||
if (engineURI == "allEngines") {
|
||||
|
|
|
|||
|
|
@ -1,125 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://communicator/skin/search/search.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://communicator/skin/search/internetresults.css" type="text/css"?>
|
||||
|
||||
<!DOCTYPE page SYSTEM "chrome://communicator/locale/search/internetresults.dtd">
|
||||
|
||||
<page onload="onLoadInternetResults();"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
title="&internetresults.title;"
|
||||
context="disallowcontext">
|
||||
|
||||
<popupset>
|
||||
<popup id="disallowcontext" onpopupshowing="return false;"/>
|
||||
</popupset>
|
||||
|
||||
<script type="application/x-javascript" src="chrome://global/content/nsUserSettings.js"/>
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/search/internetresults.js"/>
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/search/shared.js"/>
|
||||
|
||||
<hbox id="multi-results-header">
|
||||
<label value="&results.header.label;"/>
|
||||
</hbox>
|
||||
|
||||
<hbox align="center"
|
||||
style="overflow: none; min-width: 1px;">
|
||||
<label value="&viewbyprovider.label;"/>
|
||||
<menulist id="engineTabs" ref="NC:SearchResultsSitesRoot"
|
||||
datasources="rdf:internetsearch" oncommand="switchTab(1);">
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem id="chooseCat" uri="..." oncommand="doEngineClick(event, this);"
|
||||
src="rdf:http://home.netscape.com/NC-rdf#Icon"
|
||||
value="rdf:http://home.netscape.com/NC-rdf#category"
|
||||
label="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
||||
</menupopup>
|
||||
</template>
|
||||
<menupopup id="categoryPopup">
|
||||
<menuitem id="allEngines" value="NC:SearchEngineRoot" label="&allresults.title.label;"
|
||||
oncommand="doEngineClick(event, this);"/>
|
||||
<menuseparator/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
</hbox>
|
||||
|
||||
<menupopup id="contextual" onpopupshowing="return fillContextMenu('contextual', 'resultsList');"/>
|
||||
|
||||
<tree id="resultsList" flex="1" class="plain"
|
||||
datasources="rdf:internetsearch" context="contextual"
|
||||
onselect="return listSelect(event);"
|
||||
onclick ="return listClick (event);">
|
||||
|
||||
<treecols onclick="doSort(event.target.id, 'http://home.netscape.com/NC-rdf#PageRank');">
|
||||
<treecol id="NameColumn" primary="true" label="&name.column.label;"
|
||||
resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="PageRankColumn" label="&pagerank.column.label;"
|
||||
resource="http://home.netscape.com/NC-rdf#PageRank"
|
||||
resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="RelevanceColumn" label="&relevance.column.label;"
|
||||
resource="http://home.netscape.com/NC-rdf#Relevance"
|
||||
resource2="http://home.netscape.com/NC-rdf#Name"
|
||||
hidden="true" flex="1"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="PriceColumn" label="&price.column.label;"
|
||||
resource="http://home.netscape.com/NC-rdf#Price"
|
||||
resource2="http://home.netscape.com/NC-rdf#Availability"
|
||||
hidden="true" flex="1"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="AvailabilityColumn" label="&availability.column.label;"
|
||||
resource="http://home.netscape.com/NC-rdf#Availability"
|
||||
resource2="http://home.netscape.com/NC-rdf#Price"
|
||||
hidden="true" flex="1"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="DateColumn" label="&date.column.label;"
|
||||
resource="http://home.netscape.com/NC-rdf#Date"
|
||||
resource2="http://home.netscape.com/NC-rdf#Name"
|
||||
hidden="true" flex="1"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="SiteColumn" label="&site.column.label;"
|
||||
resource="http://home.netscape.com/NC-rdf#Site"
|
||||
resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="EngineColumn" label="&engine.column.label;"
|
||||
resource="http://home.netscape.com/NC-rdf#Engine"
|
||||
resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
|
||||
</treecols>
|
||||
|
||||
<template>
|
||||
<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
|
||||
<treeseparator uri="..."/>
|
||||
</rule>
|
||||
|
||||
<rule>
|
||||
<treechildren>
|
||||
<treeitem uri="...">
|
||||
<treerow>
|
||||
<treecell src="rdf:http://home.netscape.com/NC-rdf#Icon"
|
||||
label="rdf:http://home.netscape.com/NC-rdf#Name" />
|
||||
<treecell label="rdf:http://home.netscape.com/NC-rdf#PageRank"/>
|
||||
<treecell label="rdf:http://home.netscape.com/NC-rdf#Relevance"/>
|
||||
<treecell label="rdf:http://home.netscape.com/NC-rdf#Price"/>
|
||||
<treecell label="rdf:http://home.netscape.com/NC-rdf#Availability"/>
|
||||
<treecell label="rdf:http://home.netscape.com/NC-rdf#Date"/>
|
||||
<treecell label="rdf:http://home.netscape.com/NC-rdf#Site"/>
|
||||
<treecell label="rdf:http://home.netscape.com/NC-rdf#Engine"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</rule>
|
||||
</template>
|
||||
|
||||
</tree>
|
||||
|
||||
<splitter id="results-splitter" persist="state" collapse="after">
|
||||
<grippy/>
|
||||
</splitter>
|
||||
|
||||
<hbox flex="1">
|
||||
<iframe id="content" flex="1" src="chrome://communicator/locale/search/default.htm"/>
|
||||
</hbox>
|
||||
|
||||
</page>
|
||||
Загрузка…
Ссылка в новой задаче