зеркало из https://github.com/mozilla/gecko-dev.git
Bug 250637: Remove broken "Power Search" feature that was never really implemented
r=pkwarren, sr=neil
This commit is contained in:
Родитель
cb2febdff4
Коммит
0315891bf9
|
@ -41,10 +41,6 @@
|
|||
|
||||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
|
||||
|
||||
#stopButton {
|
||||
list-style-image: url("chrome://communicator/skin/icons/loading.gif");
|
||||
}
|
||||
|
||||
/* :::: undo regular search listbox selection look :::: */
|
||||
|
||||
.searchresult-item[selected="true"] {
|
||||
|
|
|
@ -41,10 +41,6 @@
|
|||
|
||||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
|
||||
|
||||
#stopButton {
|
||||
list-style-image: url("chrome://communicator/skin/icons/loading.gif");
|
||||
}
|
||||
|
||||
/* :::: undo regular search listbox selection look :::: */
|
||||
|
||||
.searchresult-item[selected="true"] {
|
||||
|
|
|
@ -97,7 +97,6 @@ pref("browser.search.defaulturl", "chrome://navigator-region/locale/region.prope
|
|||
pref("browser.search.opensidebarsearchpanel", true);
|
||||
pref("browser.search.last_search_category", "NC:SearchCategory?category=urn:search:category:1");
|
||||
pref("browser.search.mode", 0);
|
||||
pref("browser.search.powermode", 0);
|
||||
// basic search popup constraint: minimum sherlock plugin version displayed
|
||||
// (note: must be a string representation of a float or it'll default to 0.0)
|
||||
pref("browser.search.basic.min_ver", "0.0");
|
||||
|
|
|
@ -996,7 +996,7 @@ function QualifySearchTerm()
|
|||
return "";
|
||||
}
|
||||
|
||||
function OpenSearch(tabName, forceDialogFlag, searchStr, newWindowFlag)
|
||||
function OpenSearch(tabName, searchStr, newWindowFlag)
|
||||
{
|
||||
//This function needs to be split up someday.
|
||||
|
||||
|
@ -1031,55 +1031,32 @@ function OpenSearch(tabName, forceDialogFlag, searchStr, newWindowFlag)
|
|||
if (forceAsURL) {
|
||||
BrowserLoadURL()
|
||||
} else {
|
||||
var searchMode = 0;
|
||||
try {
|
||||
searchMode = pref.getIntPref("browser.search.powermode");
|
||||
} catch(ex) {
|
||||
}
|
||||
if (searchStr) {
|
||||
var escapedSearchStr = encodeURIComponent(searchStr);
|
||||
defaultSearchURL += escapedSearchStr;
|
||||
var searchDS = Components.classes["@mozilla.org/rdf/datasource;1?name=internetsearch"]
|
||||
.getService(Components.interfaces.nsIInternetSearchService);
|
||||
|
||||
if (forceDialogFlag || searchMode == 1) {
|
||||
// Use a single search dialog
|
||||
var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"]
|
||||
.getService(Components.interfaces.nsIWindowMediator);
|
||||
|
||||
var searchWindow = windowManager.getMostRecentWindow("search:window");
|
||||
if (!searchWindow) {
|
||||
openDialog("chrome://communicator/content/search/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr);
|
||||
} else {
|
||||
// Already had one, focus it and load the page
|
||||
searchWindow.focus();
|
||||
|
||||
if ("loadPage" in searchWindow)
|
||||
searchWindow.loadPage(tabName, searchStr);
|
||||
}
|
||||
} else {
|
||||
if (searchStr) {
|
||||
var escapedSearchStr = encodeURIComponent(searchStr);
|
||||
defaultSearchURL += escapedSearchStr;
|
||||
var searchDS = Components.classes["@mozilla.org/rdf/datasource;1?name=internetsearch"]
|
||||
.getService(Components.interfaces.nsIInternetSearchService);
|
||||
|
||||
searchDS.RememberLastSearchText(escapedSearchStr);
|
||||
try {
|
||||
var searchEngineURI = pref.getCharPref("browser.search.defaultengine");
|
||||
if (searchEngineURI) {
|
||||
var searchURL = getSearchUrl("actionButton");
|
||||
if (searchURL) {
|
||||
defaultSearchURL = searchURL + escapedSearchStr;
|
||||
} else {
|
||||
searchURL = searchDS.GetInternetSearchURL(searchEngineURI, escapedSearchStr, 0, 0, {value:0});
|
||||
if (searchURL)
|
||||
defaultSearchURL = searchURL;
|
||||
}
|
||||
searchDS.RememberLastSearchText(escapedSearchStr);
|
||||
try {
|
||||
var searchEngineURI = pref.getCharPref("browser.search.defaultengine");
|
||||
if (searchEngineURI) {
|
||||
var searchURL = getSearchUrl("actionButton");
|
||||
if (searchURL) {
|
||||
defaultSearchURL = searchURL + escapedSearchStr;
|
||||
} else {
|
||||
searchURL = searchDS.GetInternetSearchURL(searchEngineURI, escapedSearchStr, 0, 0, {value:0});
|
||||
if (searchURL)
|
||||
defaultSearchURL = searchURL;
|
||||
}
|
||||
} catch (ex) {
|
||||
}
|
||||
|
||||
if (!newWindowFlag)
|
||||
loadURI(defaultSearchURL);
|
||||
else
|
||||
window.open(defaultSearchURL, "_blank");
|
||||
} catch (ex) {
|
||||
}
|
||||
|
||||
if (!newWindowFlag)
|
||||
loadURI(defaultSearchURL);
|
||||
else
|
||||
window.open(defaultSearchURL, "_blank");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -220,7 +220,7 @@
|
|||
|
||||
<button id="search-button" class="button-toolbar chromeclass-location"
|
||||
label="&searchButton.label;"
|
||||
oncommand="OpenSearch('internet',false, QualifySearchTerm());"
|
||||
oncommand="OpenSearch('internet', QualifySearchTerm());"
|
||||
ondragover="nsDragAndDrop.dragOver(event, searchButtonObserver);"
|
||||
ondragdrop="nsDragAndDrop.drop(event, searchButtonObserver);"
|
||||
ondragexit="nsDragAndDrop.dragExit(event, searchButtonObserver);"
|
||||
|
|
|
@ -199,7 +199,7 @@ var searchButtonObserver = {
|
|||
var xferData = aXferData.data.split("\n");
|
||||
var uri = xferData[1] ? xferData[1] : xferData[0];
|
||||
if (uri)
|
||||
OpenSearch('internet',false, uri);
|
||||
OpenSearch('internet', uri);
|
||||
},
|
||||
getSupportedFlavours: function ()
|
||||
{
|
||||
|
|
|
@ -187,7 +187,7 @@
|
|||
<menuseparator id="context-sep-selectall"/>
|
||||
<menuitem id="context-searchselect"
|
||||
accesskey="&search.accesskey;"
|
||||
oncommand="OpenSearch('internet', false, gContextMenu.searchSelected(), true);"/>
|
||||
oncommand="OpenSearch('internet', gContextMenu.searchSelected(), true);"/>
|
||||
<menuseparator id="frame-sep"/>
|
||||
<menu id="frame" label="&thisFrameMenu.label;" accesskey="&thisFrameMenu.accesskey;">
|
||||
<menupopup id="frame_popup">
|
||||
|
|
|
@ -66,18 +66,11 @@ comm.jar:
|
|||
content/communicator/pref/pref-winhooks.js (prefwindow/resources/content/pref-winhooks.js)
|
||||
content/communicator/related/related-panel.xul (related/resources/related-panel.xul)
|
||||
content/communicator/related/related-panel.js (related/resources/related-panel.js)
|
||||
content/communicator/search/search.js (search/resources/search.js)
|
||||
content/communicator/search/search.xul (search/resources/search.xul)
|
||||
content/communicator/search/search-editor.js (search/resources/search-editor.js)
|
||||
content/communicator/search/search-editor.xul (search/resources/search-editor.xul)
|
||||
content/communicator/search/search-panel.js (search/resources/search-panel.js)
|
||||
content/communicator/search/search-panel.xul (search/resources/search-panel.xul)
|
||||
content/communicator/search/shared.js (search/resources/shared.js)
|
||||
content/communicator/search/find.js (search/resources/find.js)
|
||||
content/communicator/search/find.xul (search/resources/find.xul)
|
||||
content/communicator/search/findresults.xul (search/resources/findresults.xul)
|
||||
content/communicator/search/internet.js (search/resources/internet.js)
|
||||
content/communicator/search/internet.xul (search/resources/internet.xul)
|
||||
content/communicator/search/internetresults.js (search/resources/internetresults.js)
|
||||
content/communicator/search/internetresults.xul (search/resources/internetresults.xul)
|
||||
content/communicator/sidebar/sidebarOverlay.css (sidebar/resources/sidebarOverlay.css)
|
||||
|
@ -139,11 +132,7 @@ en-US.jar:
|
|||
locale/en-US/communicator/pref/autocomplete-autofill-off.gif (prefwindow/resources/locale/en-US/autocomplete-autofill-off.gif)
|
||||
locale/en-US/communicator/pref/autocomplete-showpopup.gif (prefwindow/resources/locale/en-US/autocomplete-showpopup.gif)
|
||||
locale/en-US/communicator/pref/autocomplete-showsearch.gif (prefwindow/resources/locale/en-US/autocomplete-showsearch.gif)
|
||||
locale/en-US/communicator/search/find.dtd (search/resources/locale/en-US/find.dtd)
|
||||
locale/en-US/communicator/search/findresults.dtd (search/resources/locale/en-US/findresults.dtd)
|
||||
locale/en-US/communicator/search/internet.dtd (search/resources/locale/en-US/internet.dtd)
|
||||
locale/en-US/communicator/search/internetresults.dtd (search/resources/locale/en-US/internetresults.dtd)
|
||||
locale/en-US/communicator/search/search.dtd (search/resources/locale/en-US/search.dtd)
|
||||
locale/en-US/communicator/search/search-editor.dtd (search/resources/locale/en-US/search-editor.dtd)
|
||||
locale/en-US/communicator/search/search-editor.properties (search/resources/locale/en-US/search-editor.properties)
|
||||
locale/en-US/communicator/search/search-panel.dtd (search/resources/locale/en-US/search-panel.dtd)
|
||||
|
|
|
@ -1,77 +0,0 @@
|
|||
|
||||
var gDatasourceName = "";
|
||||
var gMatchName = "";
|
||||
var gMethodName = "";
|
||||
var gTextName = "";
|
||||
|
||||
function doFind()
|
||||
{
|
||||
gDatasourceName = "";
|
||||
gMatchName = "";
|
||||
gMethodName = "";
|
||||
gTextName = "";
|
||||
|
||||
// get RDF datasource to query
|
||||
var datasourceNode = document.getElementById("datasource");
|
||||
var dataSource = datasourceNode.selectedItem.value;
|
||||
gDataSourceName = datasourceNode.selectedItem.label;
|
||||
dump("Datasource: " + gDatasourceName + "\n");
|
||||
|
||||
// get match
|
||||
var matchNode = document.getElementById("match");
|
||||
var match = matchNode.selectedItem.value;
|
||||
gMatchName = matchNode.selectedItem.label;
|
||||
dump("Match: " + gMatchName + "\n");
|
||||
|
||||
// get method
|
||||
var methodNode = document.getElementById("method");
|
||||
var method = methodNode.selectedItem.value;
|
||||
gMethodName = methodNode.selectedItem.label;
|
||||
dump("Method: " + method + "\n");
|
||||
|
||||
// get user text to find
|
||||
var textNode = document.getElementById("findtext");
|
||||
if (!textNode.value) return false;
|
||||
gTextName = textNode.value;
|
||||
dump("Find text: " + text + "\n");
|
||||
|
||||
// construct find URL
|
||||
var url = "find:datasource=" + datasource;
|
||||
url += "&match=" + match;
|
||||
url += "&method=" + method;
|
||||
url += "&text=" + text;
|
||||
dump("Find URL: " + url + "\n");
|
||||
|
||||
// load find URL into results pane
|
||||
var resultsTree = parent.frames[1].document.getElementById("findresultstree");
|
||||
if (!resultsTree) return false;
|
||||
resultsTree.setAttribute("ref", url);
|
||||
|
||||
// enable "Save Search" button
|
||||
var searchButton = document.getElementById("SaveSearch");
|
||||
if (searchButton)
|
||||
searchButton.removeAttribute("disabled");
|
||||
|
||||
dump("doFind done.\n");
|
||||
return(true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
function saveSearch()
|
||||
{
|
||||
var resultsTree = parent.frames[1].document.getElementById("findresultstree");
|
||||
if (!resultsTree) return(false);
|
||||
var searchURL = resultsTree.getAttribute("ref");
|
||||
if ((!searchURL) || (searchURL == "")) return(false);
|
||||
|
||||
dump("Bookmark search URL: " + searchURL + "\n");
|
||||
var searchTitle = "Search: " + gMatchName + " " + gMethodName + " '" + gTextName + "' in " + gDatasourceName;
|
||||
dump("Title: " + searchTitle + "\n\n");
|
||||
|
||||
var bmks = Components.classes["@mozilla.org/browser/bookmarks-service;1"].getService();
|
||||
if (bmks) bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService);
|
||||
if (bmks) bmks.addBookmarkImmediately(searchURL, searchTitle, bmks.BOOKMARK_FIND_TYPE, null);
|
||||
|
||||
return(true);
|
||||
}
|
|
@ -1,51 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://communicator/skin/search/search.css" type="text/css"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://communicator/locale/search/find.dtd">
|
||||
|
||||
<window title="&window.title.label;"
|
||||
class="dialog"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/search/find.js"/>
|
||||
|
||||
<hbox align="center">
|
||||
<label value="&search1.label;"/>
|
||||
<menulist id="datasource">
|
||||
<menupopup>
|
||||
<menuitem label="&bookmarks.label;" value="rdf:bookmarks"/>
|
||||
<menuitem label="&history.label;" value="rdf:history"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
<label value="&search2.label;"/>
|
||||
</hbox>
|
||||
|
||||
<hbox align="center">
|
||||
<menulist id="match">
|
||||
<menupopup>
|
||||
<menuitem label="&name.label;" value="http://home.netscape.com/NC-rdf#Name"/>
|
||||
<menuitem label="&url.label;" value="http://home.netscape.com/NC-rdf#URL"/>
|
||||
<menuitem label="&shortcut.label;" value="http://home.netscape.com/NC-rdf#ShortcutURL"/>
|
||||
<menuitem label="&description.label;" value="http://home.netscape.com/NC-Description"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
<menulist id="method">
|
||||
<menupopup>
|
||||
<menuitem label="&contains.label;" value="contains"/>
|
||||
<menuitem label="&startswith.label;" value="startswith"/>
|
||||
<menuitem label="&endswith.label;" value="endswith"/>
|
||||
<menuitem label="&is.label;" value="is"/>
|
||||
<menuitem label="&isnot.label;" value="isnot"/>
|
||||
<menuitem label="&doesntcontain.label;" value="doesntcontain"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
<textbox id="findtext" type="text" width="20" onkeypress="if (event.keyCode == 13) { doFind(); }" />
|
||||
<button label="&search.button.label;" oncommand="doFind();"/>
|
||||
</hbox>
|
||||
|
||||
<hbox align="center">
|
||||
<button id="SaveSearch" disabled="true" label="&save.button.label;" oncommand="saveSearch();"/>
|
||||
</hbox>
|
||||
|
||||
</window>
|
|
@ -1,83 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://communicator/skin/search/search.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://communicator/skin/search/findresults.css" type="text/css"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://communicator/locale/search/findresults.dtd">
|
||||
|
||||
<window class="dialog" title="&window.title.label;" style="width:100%; height:100%; background-color:white"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/search/shared.js" />
|
||||
|
||||
<tree id="findresultstree" flex="100%" datasources="rdf:bookmarks rdf:history rdf:localsearch"
|
||||
onclick="if (event.detail == 2) return OpenURL(event, event.target.parentNode.parentNode);">
|
||||
|
||||
<treecolgroup>
|
||||
<treecol id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name" sortActive="true" sortDirection="ascending" flex="1"/>
|
||||
<treecol id="URLColumn" resource="http://home.netscape.com/NC-rdf#URL" flex="1"/>
|
||||
<treecol id="ShortcutURLColumn" resource="http://home.netscape.com/NC-rdf#ShortcutURL" flex="1"/>
|
||||
<treecol id="DescriptionColumn" resource="http://home.netscape.com/NC-rdf#Description" flex="1"/>
|
||||
</treecolgroup>
|
||||
|
||||
<template>
|
||||
<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
|
||||
<treechildren flex="1">
|
||||
<treeitem uri="...">
|
||||
<treerow>
|
||||
<treecell>
|
||||
<html:hr width="75%" size="1" />
|
||||
</treecell>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</rule>
|
||||
|
||||
<rule>
|
||||
<treechildren flex="1">
|
||||
<treeitem uri="...">
|
||||
<treerow>
|
||||
<treecell>
|
||||
<treeindentation />
|
||||
<button label="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
||||
</treecell>
|
||||
<treecell>
|
||||
<button label="rdf:http://home.netscape.com/NC-rdf#URL" style="list-style-image: none;" />
|
||||
</treecell>
|
||||
<treecell>
|
||||
<button label="rdf:http://home.netscape.com/NC-rdf#ShortcutURL" style="list-style-image: none;" />
|
||||
</treecell>
|
||||
<treecell>
|
||||
<button label="rdf:http://home.netscape.com/NC-rdf#Description" style="list-style-image: none;" />
|
||||
</treecell>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</rule>
|
||||
</template>
|
||||
|
||||
<treehead>
|
||||
<treerow>
|
||||
<treecell observes="NameColumn" label="&name.column.label;" resource="http://home.netscape.com/NC-rdf#Name" onclick="return doSort('NameColumn');" sortActive="true" sortDirection="ascending" />
|
||||
<treecell observes="URLColumn" label="&url.column.label;" resource="http://home.netscape.com/NC-rdf#URL" onclick="return doSort('URLColumn');" />
|
||||
<treecell observes="ShortcutURLColumn" label="&shortcuturl.column.label;" resource="http://home.netscape.com/NC-rdf#ShortcutURL" onclick="return doSort('ShortcutURLColumn');" />
|
||||
<treecell observes="DescriptionColumn" label="&description.column.label;" resource="http://home.netscape.com/NC-rdf#Description" onclick="return doSort('DescriptionColumn');" />
|
||||
</treerow>
|
||||
</treehead>
|
||||
|
||||
<treechildren open="true" flex="1"/>
|
||||
</tree>
|
||||
<spacer flex="100%" orient="horizontal" />
|
||||
|
||||
<!--
|
||||
This extra "status" bar is necessary because the bottom right corner of the window on MacOS is
|
||||
taken up by the growBox. If this window had a horizontal scrollbar, we'd be alright, but since
|
||||
it doesn't the bottom arrow on the vertical scrollbar was being hidden by this growBox. To
|
||||
combat this, we can just stick in a 15px high bar to bump up the bottom of the tree so that
|
||||
the scrollbar is visible. Yes, I know this is not necessary for win32 or gtk, but we can
|
||||
use this area for information (maybe full URL of selected item or the like) in the future.
|
||||
-->
|
||||
<hbox id="status-bar" style="min-height:15px; max-height:15px;">
|
||||
<button class="status-bar" label=""/>
|
||||
</hbox>
|
||||
</window>
|
|
@ -1,95 +0,0 @@
|
|||
|
||||
var gText = "";
|
||||
var gSites = "";
|
||||
|
||||
|
||||
|
||||
function loadPage()
|
||||
{
|
||||
// check and see if we need to do an automatic search
|
||||
if (window.parent)
|
||||
{
|
||||
var searchText = window.parent.getSearchText();
|
||||
if (searchText)
|
||||
{
|
||||
var textNode = document.getElementById("searchtext");
|
||||
if (textNode)
|
||||
{
|
||||
textNode.setAttribute("value", searchText);
|
||||
doSearch();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function doCheckAll(activeFlag)
|
||||
{
|
||||
// get selected search engines
|
||||
var treeNode = document.getElementById("searchengines");
|
||||
if (!treeNode) return(false);
|
||||
var treeChildrenNode = null;
|
||||
var numChildren = treeNode.childNodes.length;
|
||||
for (var x = 0; x<numChildren; x++)
|
||||
{
|
||||
if (treeNode.childNodes[x].tagName == "treechildren")
|
||||
{
|
||||
treeChildrenNode = treeNode.childNodes[x];
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (treeChildrenNode == null) return(false);
|
||||
|
||||
var numEngines = treeChildrenNode.childNodes.length;
|
||||
|
||||
for (var x = 0; x<numEngines; x++)
|
||||
{
|
||||
var treeItem = treeChildrenNode.childNodes[x];
|
||||
if (!treeItem)
|
||||
continue;
|
||||
|
||||
var checkedFlag = false;
|
||||
|
||||
if (treeItem.childNodes[0].childNodes[0].childNodes[0].checked == true)
|
||||
{
|
||||
checkedFlag = true;
|
||||
}
|
||||
else if (treeItem.childNodes[0].childNodes[0].childNodes[0].getAttribute("checked") == "1")
|
||||
{
|
||||
checkedFlag = true;
|
||||
}
|
||||
|
||||
if (checkedFlag != activeFlag)
|
||||
{
|
||||
treeItem.childNodes[0].childNodes[0].childNodes[0].checked = activeFlag;
|
||||
if (activeFlag)
|
||||
{
|
||||
treeItem.childNodes[0].childNodes[0].childNodes[0].setAttribute("checked", "1");
|
||||
}
|
||||
else
|
||||
{
|
||||
treeItem.childNodes[0].childNodes[0].childNodes[0].removeAttribute("checked");
|
||||
// treeItem.childNodes[0].childNodes[0].childNodes[0].setAttribute("checked", "0");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return(true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
function saveSearch()
|
||||
{
|
||||
var resultsTree = parent.frames[1].document.getElementById("internetresultstree");
|
||||
if (!resultsTree) return(false);
|
||||
var searchURL = resultsTree.getAttribute("ref");
|
||||
if ((!searchURL) || (searchURL == "")) return(false);
|
||||
|
||||
var bmks = Components.classes["@mozilla.org/browser/bookmarks-service;1"].getService();
|
||||
if (bmks) bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService);
|
||||
|
||||
var searchTitle = "Search: '" + gText + "' using " + gSites;
|
||||
if (bmks) bmks.addBookmarkImmediately(searchURL, searchTitle, bmks.BOOKMARK_SEARCH_TYPE, null);
|
||||
|
||||
return(true);
|
||||
}
|
|
@ -1,91 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://communicator/skin/search/search.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://communicator/skin/search/internet.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://communicator/skin/search/icons.css" type="text/css"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://communicator/locale/search/internet.dtd">
|
||||
|
||||
<window class="dialog"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="loadPage()" onunload="unloadPage()">
|
||||
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/search/internet.js" />
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/search/shared.js" />
|
||||
|
||||
<hbox>
|
||||
<spacer flex="100%" />
|
||||
|
||||
<description>&search.label;</description>
|
||||
|
||||
<template id="categoryTemplate">
|
||||
<rule iscontainer="true">
|
||||
<menulist uri="..." label="rdf:http://home.netscape.com/NC-rdf#title" />
|
||||
</rule>
|
||||
|
||||
<rule>
|
||||
<menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#category"
|
||||
label="rdf:http://home.netscape.com/NC-rdf#title" />
|
||||
</rule>
|
||||
</template>
|
||||
|
||||
<menulist id="categoryList" template="categoryTemplate" ref="NC:SearchCategoryRoot" datasources="rdf:null"
|
||||
sortResource="http://home.netscape.com/NC-rdf#title" sortDirection="ascending"
|
||||
onchange="return chooseCategory(this)" >
|
||||
|
||||
<menuitem value="NC:SearchEngineRoot" label="&allengines.label;"/>
|
||||
|
||||
</menulist>
|
||||
|
||||
<description>&for.label;</description>
|
||||
<textfield id="searchtext" size="20" onkeypress="if (event.keyCode == 13) { doSearch(); }" />
|
||||
<button id="searchbutton" oncommand="return doSearch();" label="&search.button.label;"/>
|
||||
<button id="stopbutton" oncommand="return doStop();" style="display: none;" label="&stop.button.label;"/>
|
||||
<spacer flex="100%"/>
|
||||
</hbox>
|
||||
|
||||
<hbox style="height: 85%; width: 100%;" flex="1" >
|
||||
<spacer flex="50%" />
|
||||
<tree orient="horizontal" id="searchengines" border="1" flex="1" datasources="rdf:internetsearch" ref="NC:SearchEngineRoot">
|
||||
<treecolgroup>
|
||||
<treecol id="CheckboxColumn" flex="1"/>
|
||||
<treecol id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name" sortActive="true" sortDirection="ascending" flex="1"/>
|
||||
<treecol id="DescColumn" resource="http://home.netscape.com/NC-rdf#Description" resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
|
||||
</treecolgroup>
|
||||
|
||||
<template>
|
||||
<treechildren flex="1">
|
||||
<treeitem uri="..." loading="rdf:http://home.netscape.com/NC-rdf#loading" >
|
||||
<treerow>
|
||||
<treecell allowevents="true">
|
||||
<checkbox oncommand="doCheck(this)" />
|
||||
</treecell>
|
||||
<treecell allowevents="true">
|
||||
<button class="iconic" flex="1" crop="right" src="rdf:http://home.netscape.com/NC-rdf#Icon" label="rdf:http://home.netscape.com/NC-rdf#Name" />
|
||||
</treecell>
|
||||
<treecell allowevents="true">
|
||||
<button flex="1" crop="right" label="rdf:http://home.netscape.com/NC-rdf#Description" />
|
||||
</treecell>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</template>
|
||||
|
||||
<treehead>
|
||||
<treerow>
|
||||
<treecell label="&checkbox.column.label;"/>
|
||||
<treecell observes="NameColumn" label="&engine.column.label;" resource="http://home.netscape.com/NC-rdf#Name" onclick="return doSort('NameColumn');" sortActive="true" sortDirection="ascending"/>
|
||||
<treecell observes="DescColumn" label="&description.column.label;" resource="http://home.netscape.com/NC-rdf#Description" resource2="http://home.netscape.com/NC-rdf#Name" onclick="return doSort('DescColumn');" />
|
||||
</treerow>
|
||||
</treehead>
|
||||
</tree>
|
||||
<spacer flex="50%" />
|
||||
</hbox>
|
||||
|
||||
<hbox style="width: 100%;" >
|
||||
<spacer flex="100%" />
|
||||
<button oncommand="doCheckAll(true);" label="&checkall.button.label;"/>
|
||||
<button oncommand="doCheckAll(false);" label="&uncheckall.button.label;"/>
|
||||
<button id="SaveSearch" disabled="true" oncommand="saveSearch();" label="&savesearch.button.label;"/>
|
||||
<spacer flex="100%"/>
|
||||
</hbox>
|
||||
</window>
|
|
@ -1,58 +0,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 Communicator.
|
||||
-
|
||||
- The Initial Developer of the Original Code is
|
||||
- Netscape Communications Corp.
|
||||
- Portions created by the Initial Developer are Copyright (C) 1999
|
||||
- the Initial Developer. All Rights Reserved.
|
||||
-
|
||||
- Contributor(s):
|
||||
-
|
||||
- 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 ***** -->
|
||||
|
||||
<!ENTITY window.title.label "Find Local Data">
|
||||
|
||||
<!ENTITY search1.label "Search for items in ">
|
||||
<!ENTITY search2.label " whose ">
|
||||
|
||||
<!ENTITY search.button.label "Search">
|
||||
<!ENTITY save.button.label "Save Search in Bookmarks">
|
||||
|
||||
<!ENTITY bookmarks.label "Bookmarks">
|
||||
<!ENTITY history.label "History">
|
||||
|
||||
<!ENTITY name.label "Name">
|
||||
<!ENTITY url.label "URL">
|
||||
<!ENTITY shortcut.label "Custom Keyword">
|
||||
<!ENTITY description.label "Description">
|
||||
|
||||
<!ENTITY contains.label "contains">
|
||||
<!ENTITY startswith.label "starts with">
|
||||
<!ENTITY endswith.label "ends with">
|
||||
<!ENTITY is.label "is">
|
||||
<!ENTITY isnot.label "is not">
|
||||
<!ENTITY doesntcontain.label "doesn't contain">
|
|
@ -1,42 +0,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 Communicator.
|
||||
-
|
||||
- The Initial Developer of the Original Code is
|
||||
- Netscape Communications Corp.
|
||||
- Portions created by the Initial Developer are Copyright (C) 1999
|
||||
- the Initial Developer. All Rights Reserved.
|
||||
-
|
||||
- Contributor(s):
|
||||
-
|
||||
- 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 ***** -->
|
||||
|
||||
<!ENTITY window.title.label "Find Results">
|
||||
|
||||
<!ENTITY name.column.label "Name">
|
||||
<!ENTITY url.column.label "URL">
|
||||
<!ENTITY shortcuturl.column.label "Custom Keyword">
|
||||
<!ENTITY description.column.label "Description">
|
|
@ -1,50 +0,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 Communicator.
|
||||
-
|
||||
- The Initial Developer of the Original Code is
|
||||
- Netscape Communications Corp.
|
||||
- Portions created by the Initial Developer are Copyright (C) 1999
|
||||
- the Initial Developer. All Rights Reserved.
|
||||
-
|
||||
- Contributor(s):
|
||||
-
|
||||
- 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 ***** -->
|
||||
|
||||
<!ENTITY search.label "Search the ">
|
||||
<!ENTITY for.label " category for ">
|
||||
|
||||
<!ENTITY allengines.label "All Engines">
|
||||
|
||||
<!ENTITY checkbox.column.label "On">
|
||||
<!ENTITY engine.column.label "Search Engines">
|
||||
<!ENTITY description.column.label "Description">
|
||||
|
||||
<!ENTITY search.button.label "Search">
|
||||
<!ENTITY stop.button.label "Stop">
|
||||
<!ENTITY checkall.button.label "Check All">
|
||||
<!ENTITY uncheckall.button.label "Uncheck All">
|
||||
<!ENTITY savesearch.button.label "Save Search in Bookmarks">
|
|
@ -1,50 +0,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 Communicator.
|
||||
-
|
||||
- The Initial Developer of the Original Code is
|
||||
- Netscape Communications Corp.
|
||||
- Portions created by the Initial Developer are Copyright (C) 1999
|
||||
- the Initial Developer. All Rights Reserved.
|
||||
-
|
||||
- Contributor(s):
|
||||
-
|
||||
- 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 ***** -->
|
||||
|
||||
<!ENTITY window.title.label "Search">
|
||||
<!ENTITY find.title.label "Search Bookmarks/History">
|
||||
<!ENTITY internet.title.label "Search the Internet">
|
||||
<!ENTITY mailnews.title.label "Search Mail/News">
|
||||
<!ENTITY addressbook.title.label "Search Addressbook">
|
||||
|
||||
<!ENTITY menu.file.label "File">
|
||||
<!ENTITY menuitem.close.label "Close">
|
||||
|
||||
<!ENTITY menu.edit.label "Edit">
|
||||
<!ENTITY menuitem.undo.label "Undo">
|
||||
<!ENTITY menuitem.cut.label "Cut">
|
||||
<!ENTITY menuitem.copy.label "Copy">
|
||||
<!ENTITY menuitem.paste.label "Paste">
|
|
@ -1,89 +0,0 @@
|
|||
|
||||
var gSearchStr = "";
|
||||
var gTabName = "";
|
||||
|
||||
function loadPage(thePage, searchStr)
|
||||
{
|
||||
var content="", results="";
|
||||
var tabName="";
|
||||
|
||||
gSearchStr = "";
|
||||
|
||||
if (thePage == "find")
|
||||
{
|
||||
tabName="findTab";
|
||||
content="chrome://communicator/content/search/find.xul";
|
||||
results="chrome://communicator/content/search/findresults.xul";
|
||||
}
|
||||
else if (thePage == "internet")
|
||||
{
|
||||
tabName="internetTab";
|
||||
content="chrome://communicator/content/search/internet.xul";
|
||||
results="chrome://communicator/content/search/internetresults.xul";
|
||||
|
||||
if ((searchStr) && (searchStr != null))
|
||||
{
|
||||
gSearchStr = searchStr;
|
||||
}
|
||||
}
|
||||
else if (thePage == "mail")
|
||||
{
|
||||
tabName="mailnewsTab";
|
||||
content="about:blank";
|
||||
results="about:blank";
|
||||
}
|
||||
else if (thePage == "addressbook")
|
||||
{
|
||||
tabName="addressbookTab";
|
||||
content="about:blank";
|
||||
results="about:blank";
|
||||
}
|
||||
|
||||
if (tabName == gTabName) return(true);
|
||||
gTabName = tabName;
|
||||
|
||||
if ((content != "") && (results != ""))
|
||||
{
|
||||
var contentFrame = document.getElementById("content");
|
||||
if (contentFrame)
|
||||
{
|
||||
contentFrame.setAttribute("src", content);
|
||||
}
|
||||
var resultsFrame = document.getElementById("results");
|
||||
if (resultsFrame)
|
||||
{
|
||||
resultsFrame.setAttribute("src", results);
|
||||
}
|
||||
var theTab = document.getElementById(tabName);
|
||||
if (theTab)
|
||||
{
|
||||
theTab.setAttribute("selected", "true");
|
||||
}
|
||||
}
|
||||
return(true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
function getSearchText()
|
||||
{
|
||||
return(gSearchStr);
|
||||
}
|
||||
|
||||
|
||||
|
||||
function doUnload()
|
||||
{
|
||||
// Get the current window position/size.
|
||||
var x = window.screenX;
|
||||
var y = window.screenY;
|
||||
var h = window.outerHeight;
|
||||
var w = window.outerWidth;
|
||||
|
||||
// Store these into the window attributes (for persistence).
|
||||
var win = document.getElementById( "search-window" );
|
||||
win.setAttribute( "x", x );
|
||||
win.setAttribute( "y", y );
|
||||
win.setAttribute( "height", h );
|
||||
win.setAttribute( "width", w );
|
||||
}
|
|
@ -1,45 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://communicator/skin/search/search.css" type="text/css"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://communicator/locale/search/search.dtd">
|
||||
|
||||
<window id="search-window" title="&window.title.label;"
|
||||
class="dialog" windowtype="search:window"
|
||||
width="500" height="400" x="20" y="20" persist="width height x y"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="loadPage(window.arguments[0], window.arguments[1])" onunload="doUnload()" >
|
||||
|
||||
<menubar>
|
||||
<menu label="&menu.file.label;">
|
||||
<menupopup>
|
||||
<menuitem label="&menuitem.close.label;" oncommand="window.close()" />
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menu label="&menu.edit.label;">
|
||||
<menupopup>
|
||||
<menuitem label="x&menuitem.undo.label;"/>
|
||||
<menuseparator/>
|
||||
<menuitem label="x&menuitem.cut.label;"/>
|
||||
<menuitem label="x&menuitem.copy.label;"/>
|
||||
<menuitem label="x&menuitem.paste.label;"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
</menubar>
|
||||
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/search/search.js" />
|
||||
|
||||
<tabbox>
|
||||
<tabs>
|
||||
<tab id="findTab" oncommand="loadPage('find', null);" label="&find.title.label;"/>
|
||||
<tab id="internetTab" oncommand="loadPage('internet', null);" label="&internet.title.label;"/>
|
||||
<tab id="mailnewsTab" oncommand="loadPage('mail', null);" label="&mailnews.title.label;"/>
|
||||
<tab id="addressbookTab" oncommand="loadPage('addressbook', null);" label="&addressbook.title.label;"/>
|
||||
</tabs>
|
||||
|
||||
<tabpanels/>
|
||||
</tabbox>
|
||||
|
||||
<iframe src="about:blank" height="150" width="100%" style="height: 150; width: 100%;" id="content" />
|
||||
<iframe src="about:blank" height="100%" width="100%" style="height: 100%; width: 100%;" flex="100%" id="results" />
|
||||
</window>
|
Загрузка…
Ссылка в новой задаче