Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AddBookmark() now takes an additional type parameter.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@68227 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rjc%netscape.com 2000-05-04 11:40:28 +00:00
parent a539ab2494
commit ff2b86c155
10 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/xpfe/browser/resources/content/navigator.js
View File

@ -1062,7 +1062,7 @@ function RevealSearchPanel()
{
title = url;
}
bmks.AddBookmark(url, title);
bmks.AddBookmark(url, title, bmks.BOOKMARK_DEFAULT_TYPE);
}
// Set up a lame hack to avoid opening two bookmarks.

6
mozilla/xpfe/components/bookmarks/public/nsIBookmarksService.idl
View File

@ -31,9 +31,13 @@
[scriptable, uuid(a82e9300-e4af-11d2-8fdf-0008c70adc7b)]
interface nsIBookmarksService : nsISupports
{
const unsigned long BOOKMARK_DEFAULT_TYPE = 0;
const unsigned long BOOKMARK_SEARCH_TYPE = 1;
const unsigned long BOOKMARK_FIND_TYPE = 2;
void ReadBookmarks();
boolean IsBookmarked(in string aURI);
void AddBookmark(in string aURI, in wstring aTitle);
void AddBookmark(in string aURI, in wstring aTitle, in long bmType);
void UpdateBookmarkLastVisitedDate(in string aURL);
string FindShortcut(in wstring aName);
};

2
mozilla/xpfe/components/bookmarks/resources/bm-find.js
View File

@ -149,7 +149,7 @@ function saveFind()
var bmks = Components.classes["component://netscape/browser/bookmarks-service"].getService();
if (bmks) bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService);
if (bmks) bmks.AddBookmark(searchURL, searchTitle);
if (bmks) bmks.AddBookmark(searchURL, searchTitle, bmks.BOOKMARK_FIND_TYPE);
return(true);
}

24
mozilla/xpfe/components/bookmarks/resources/bm-find.xul
View File

@ -40,8 +40,8 @@
onload="doLoad()" onunload="doUnload()"
>
<html:script src="chrome://global/content/treePopups.js" />
<html:script src="chrome://communicator/content/bookmarks/bm-find.js" />
<html:script src="chrome://global/content/treePopups.js" />
<menubar>
<menu value="&menu.file.label;">
@ -100,9 +100,9 @@
</menupopup>
</menulist>
<textfield id="findtext" type="text" style="width:10em;" onkeyup="if (event.which == 13) { doFind(); }" />
<textfield id="findtext" type="text" style="width:10em;" onkeyup="if (event.which == 13) { return doFind(); }" />
<box autostretch="never">
<titledbutton value="&search.button.label;" onclick="return doFind();" class="dialog toolbar-non-iconic" />
<button value="&search.button.label;" onclick="return doFind();" class="dialog toolbar-non-iconic" />
</box>
<spring align="horizontal" flex="100%" />
</box>
@ -158,10 +158,18 @@
<treehead>
<treerow id="headRow">
<treecell observes="NameColumn" value="&name.label;" resource="http://home.netscape.com/NC-rdf#Name" onclick="return doSort('NameColumn', null);" sortActive="true" sortDirection="ascending" />
<treecell observes="URLColumn" value="&url.label;" resource="http://home.netscape.com/NC-rdf#URL" onclick="return doSort('URLColumn', null);" />
<treecell observes="ShortcutURLColumn" value="&shortcut.label;" resource="http://home.netscape.com/NC-rdf#ShortcutURL" onclick="return doSort('ShortcutURLColumn', null);" />
<treecell observes="DescriptionColumn" value="&description.label;" resource="http://home.netscape.com/NC-rdf#Description" onclick="return doSort('DescriptionColumn', null);" />
<treecell class="treecell-header sortDirectionIndicator" observes="NameColumn"
value="&name.label;" resource="http://home.netscape.com/NC-rdf#Name"
onclick="return doSort('NameColumn', null);" sortActive="true" sortDirection="ascending" />
<treecell class="treecell-header sortDirectionIndicator" observes="URLColumn"
value="&url.label;" resource="http://home.netscape.com/NC-rdf#URL"
onclick="return doSort('URLColumn', null);" />
<treecell class="treecell-header sortDirectionIndicator" observes="ShortcutURLColumn"
value="&shortcut.label;" resource="http://home.netscape.com/NC-rdf#ShortcutURL"
onclick="return doSort('ShortcutURLColumn', null);" />
<treecell class="treecell-header sortDirectionIndicator" observes="DescriptionColumn"
value="&description.label;" resource="http://home.netscape.com/NC-rdf#Description"
onclick="return doSort('DescriptionColumn', null);" />
<treecell allowevents="true" id="popupCell">
<menu>
@ -178,7 +186,7 @@
<box align="horizontal">
<spring flex="1" />
<titledbutton id="SaveSearch" disabled="true" value="&save.button.label;" onclick="return saveFind();" class="dialog toolbar-non-iconic"/>
<button id="SaveSearch" disabled="true" value="&save.button.label;" onclick="return saveFind();" class="dialog toolbar-non-iconic"/>
<spring flex="1" />
</box>

8
mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
View File

@ -2747,7 +2747,7 @@ NS_IMPL_QUERY_INTERFACE6(nsBookmarksService,
NS_IMETHODIMP
nsBookmarksService::AddBookmark(const char *aURI, const PRUnichar *aOptionalTitle)
nsBookmarksService::AddBookmark(const char *aURI, const PRUnichar *aOptionalTitle, PRInt32 bmType)
{
// XXX Constructing a parser object to do this is bad.
// We need to factor AddBookmark() into its own little
@ -2768,10 +2768,12 @@ nsBookmarksService::AddBookmark(const char *aURI, const PRUnichar *aOptionalTitl
// figure out where to add the new bookmark
nsCOMPtr<nsIRDFResource> bookmarkType = kNC_NewBookmarkFolder;
// hack: route "internetsearch:" URLs if necessary
if (!nsCRT::strncmp(aURI, "internetsearch:", 15))
switch(bmType)
{
case BOOKMARK_SEARCH_TYPE:
case BOOKMARK_FIND_TYPE:
bookmarkType = kNC_NewSearchFolder;
break;
}
nsCOMPtr<nsIRDFResource> newBookmarkFolder;

4
mozilla/xpfe/components/remote/src/remoteControl.js
View File

@ -99,11 +99,11 @@ var browserRemoteControl = {
if ( !aURL ) return(false);
if ( aTitle )
{
bookmarkService.AddBookmark(aURL, aTitle);
bookmarkService.AddBookmark(aURL, aTitle, bookmarkService.BOOKMARK_DEFAULT_TYPE );
}
else
{
bookmarkService.AddBookmark(aURL, null);
bookmarkService.AddBookmark(aURL, null, bookmarkService.BOOKMARK_DEFAULT_TYPE);
}
return(true);
}

2
mozilla/xpfe/components/search/resources/find.js
View File

@ -87,7 +87,7 @@ function saveSearch()
var bmks = Components.classes["component://netscape/browser/bookmarks-service"].getService();
if (bmks) bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService);
if (bmks) bmks.AddBookmark(searchURL, searchTitle);
if (bmks) bmks.AddBookmark(searchURL, searchTitle, bmks.BOOKMARK_FIND_TYPE);
return(true);
}

2
mozilla/xpfe/components/search/resources/internet.js
View File

@ -97,7 +97,7 @@ function saveSearch()
if (bmks) bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService);
var searchTitle = "Search: '" + gText + "' using " + gSites;
if (bmks) bmks.AddBookmark(searchURL, searchTitle);
if (bmks) bmks.AddBookmark(searchURL, searchTitle, bmks.BOOKMARK_SEARCH_TYPE);
return(true);
}

2
mozilla/xpfe/components/search/resources/search-panel.js
View File

@ -999,7 +999,7 @@ function saveSearch()
if( !textNode ) return(false);
var searchTitle = "Search: '" + lastSearchText + "'"; // using " + gSites;
if (bmks) bmks.AddBookmark(lastSearchURI, searchTitle);
if (bmks) bmks.AddBookmark(lastSearchURI, searchTitle, bmks.BOOKMARK_SEARCH_TYPE);
return(true);
}

2
mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
View File

@ -1579,7 +1579,7 @@ InternetSearchDataSource::addToBookmarks(nsIRDFResource *src)
char *uri = getSearchURI(src);
if (uri)
{
rv = bookmarks->AddBookmark(uri, name );
rv = bookmarks->AddBookmark(uri, name, nsIBookmarksService::BOOKMARK_SEARCH_TYPE );
Recycle(uri);
}
}