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

Small search changes: open up "Search Results" sidebar panel whenever we have new search results (if pref is set to do so) irregardless of whether its by clicking on the "Search" button or not.

This commit is contained in:
rjc%netscape.com 2006-09-14 05:40:43 +00:00
Родитель 4fac4e2fb1
Коммит a4c82b97de
1 изменённых файлов: 45 добавлений и 29 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

74
suite/browser/navigator.js
Просмотреть файл

@ -416,7 +416,8 @@ function UpdateHistory(event)
// dump("UpdateHistory: content's location is '" + window.content.location.href + "',\n");
//dump(" title is '" + window.content.document.title + "'\n");
if (window.content.location.href && window.content.location.href != "")
if ((window.content.location.href) && (window.content.location.href != "")
&& (event.target.toString().indexOf("HTMLDocument") >= 0))
{
try
{
@ -457,7 +458,8 @@ function savePage( url ) {
function UpdateBookmarksLastVisitedDate(event)
{
if (window.content.location.href && window.content.location.href != "")
if ((window.content.location.href) && (window.content.location.href != "")
&& (event.target.toString().indexOf("HTMLDocument") >= 0))
{
try
{
@ -477,17 +479,25 @@ function UpdateBookmarksLastVisitedDate(event)
function UpdateInternetSearchResults(event)
{
if (window.content.location.href && window.content.location.href != "")
if ((window.content.location.href) && (window.content.location.href != "")
&& (event.target.toString().indexOf("HTMLDocument") >= 0))
{
var searchInProgressFlag = false;
try
{
var search = Components.classes["component://netscape/rdf/datasource?name=internetsearch"].getService();
if (search) search = search.QueryInterface(Components.interfaces.nsIInternetSearchService);
if (search) search.FindInternetSearchResults(window.content.location.href);
if (search) searchInProgressFlag = search.FindInternetSearchResults(window.content.location.href);
}
catch(ex)
{
}
if (searchInProgressFlag == true)
{
RevealSearchPanel();
}
}
}
@ -881,6 +891,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
var searchEngineURI = null;
var autoOpenSearchPanel = false;
var defaultSearchURL = null;
try
{
searchMode = pref.GetIntPref("browser.search.powermode");
@ -930,41 +941,46 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
window.content.location.href = defaultSearchURL;
}
// rjc Note: the following is all a hack until the sidebar has appropriate APIs
// to check whether its shown/hidden, open/closed, and can show a particular panel
// should we try and open up the sidebar to show the "Search Results" panel?
if (autoOpenSearchPanel == true)
{
var sidebar = document.getElementById('sidebar-box');
var sidebar_splitter = document.getElementById('sidebar-splitter');
var searchPanel = document.getElementById("urn:sidebar:panel:search");
RevealSearchPanel();
}
}
if (sidebar && sidebar_splitter && searchPanel)
function RevealSearchPanel()
{
// rjc Note: the following is all a hack until the sidebar has appropriate APIs
// to check whether its shown/hidden, open/closed, and can show a particular panel
var sidebar = document.getElementById("sidebar-box");
var sidebar_splitter = document.getElementById("sidebar-splitter");
var searchPanel = document.getElementById("urn:sidebar:panel:search");
if (sidebar && sidebar_splitter && searchPanel)
{
var is_hidden = sidebar.getAttribute("hidden");
if (is_hidden && is_hidden == "true")
{
var is_hidden = sidebar.getAttribute('hidden');
if (is_hidden && is_hidden == "true")
{
sidebarShowHide();
}
}
var sidebar_style = sidebar.getAttribute("style");
if (sidebar_style)
{
var visibility = sidebar_style.match("visibility:([^;]*)")
if (visibility)
{
{
sidebarShowHide();
}
}
var sidebar_style = sidebar.getAttribute("style");
if (sidebar_style)
{
var visibility = sidebar_style.match('visibility:([^;]*)')
if (visibility)
visibility = visibility[1];
if (visibility.indexOf("collapse") >= 0)
{
visibility = visibility[1];
if (visibility.indexOf("collapse") >= 0)
{
sidebar.removeAttribute("style");
sidebar.setAttribute("style", "width:100%; height:100%; hidden:false; visibility:show;");
}
sidebar.removeAttribute("style");
sidebar.setAttribute("style", "width:100%; height:100%; hidden:false; visibility:show;");
}
}
sidebarOpenClosePanel(searchPanel);
}
sidebarOpenClosePanel(searchPanel);
}
}