Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 373838 - Replace nsNavHistoryResultTreeViewer with a JS, browser-specific tree view. r=dietrich.

Browse Source
This commit is contained in:
mozilla.mano@sent.com 2007-03-25 05:28:29 -07:00
parent 2182273df2
commit 268fae2aa7
13 changed files with 1158 additions and 1716 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/places/content/placesOverlay.xul
View File

@ -54,6 +54,8 @@
src="chrome://browser/content/places/utils.js"/>
<script type="application/x-javascript"
src="chrome://browser/content/places/controller.js"/>
<script type="application/x-javascript"
src="chrome://browser/content/places/treeView.js"/>
<script type="application/x-javascript"
src="chrome://browser/content/places/treeHelpers.js"/>
<script type="application/x-javascript"

11
browser/components/places/content/tree.xml
View File

@ -133,14 +133,9 @@
<body><![CDATA[
var result = PlacesUtils.history.executeQueries(queries, queries.length,
options);
var treeviewer =
Cc["@mozilla.org/browser/nav-history/result-tree-viewer;1"].
createInstance(Ci.nsINavHistoryResultViewer);
result.viewer = treeviewer;
treeviewer.QueryInterface(Ci.nsITreeView);
this.view = treeviewer;
var treeView = new PlacesTreeView();
result.viewer = treeView;
this.view = treeView;
]]></body>
</method>

1092
browser/components/places/content/treeView.js Normal file
View File

File diff suppressed because it is too large Load Diff

44
browser/components/places/content/utils.js
View File

@ -126,6 +126,18 @@ var PlacesUtils = {
return this._annotations;
},
/**
* The Favicons Service
*/
_favicons: null,
get favicons() {
if (!this._favicons) {
this._favicons = Cc["@mozilla.org/browser/favicon-service;1"].
getService(Ci.nsIFaviconService);
}
return this._favicons;
},
/**
* The Transaction Manager for this window.
*/
@ -221,6 +233,21 @@ var PlacesUtils = {
return (aNode.type == Ci.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR);
},
/**
* Determines whether or not a ResultNode is a visit item or not
* @param aNode
* A NavHistoryResultNode
* @returns true if the node is a visit item, false otherwise
*/
nodeIsVisit: function PU_nodeIsVisit(aNode) {
NS_ASSERT(aNode, "null node");
const NHRN = Ci.nsINavHistoryResultNode;
var type = aNode.type;
return type == NHRN.RESULT_TYPE_VISIT ||
type == NHRN.RESULT_TYPE_FULL_VISIT;
},
/**
* Determines whether or not a ResultNode is a URL item or not
* @param aNode
@ -231,9 +258,10 @@ var PlacesUtils = {
NS_ASSERT(aNode, "null node");
const NHRN = Ci.nsINavHistoryResultNode;
return aNode.type == NHRN.RESULT_TYPE_URI ||
aNode.type == NHRN.RESULT_TYPE_VISIT ||
aNode.type == NHRN.RESULT_TYPE_FULL_VISIT;
var type = aNode.type;
return type == NHRN.RESULT_TYPE_URI ||
type == NHRN.RESULT_TYPE_VISIT ||
type == NHRN.RESULT_TYPE_FULL_VISIT;
},
/**
@ -287,10 +315,12 @@ var PlacesUtils = {
NS_ASSERT(aNode, "null node");
const NHRN = Ci.nsINavHistoryResultNode;
return aNode.type == NHRN.RESULT_TYPE_HOST ||
aNode.type == NHRN.RESULT_TYPE_QUERY ||
aNode.type == NHRN.RESULT_TYPE_FOLDER ||
aNode.type == NHRN.RESULT_TYPE_REMOTE_CONTAINER;
var type = aNode.type;
return type == NHRN.RESULT_TYPE_HOST ||
type == NHRN.RESULT_TYPE_QUERY ||
type == NHRN.RESULT_TYPE_FOLDER ||
type == NHRN.RESULT_TYPE_DAY ||
type == NHRN.RESULT_TYPE_REMOTE_CONTAINER;
},
/**

1
browser/components/places/jar.mn
View File

@ -12,6 +12,7 @@ browser.jar:
* content/browser/places/tree.xml (content/tree.xml)
* content/browser/places/utils.js (content/utils.js)
* content/browser/places/controller.js (content/controller.js)
* content/browser/places/treeView.js (content/treeView.js)
* content/browser/places/treeHelpers.js (content/treeHelpers.js)
* content/browser/places/demos/time.xul (content/demos/time.xul)
* content/browser/places/demos/time.html (content/demos/time.html)

3
toolkit/components/build/nsToolkitCompsCID.h
View File

@ -88,9 +88,6 @@
#define NS_NAVHISTORYSERVICE_CONTRACTID \
"@mozilla.org/browser/nav-history-service;1"
#define NS_NAVHISTORYRESULTTREEVIEWER_CONTRACTID \
"@mozilla.org/browser/nav-history/result-tree-viewer;1"
#define NS_ANNOTATIONSERVICE_CONTRACTID \
"@mozilla.org/browser/annotation-service;1"

7
toolkit/components/places/public/nsIFaviconService.idl
View File

@ -40,7 +40,7 @@
interface nsIURI;
[scriptable, uuid(b7fc8b9b-d85f-4d89-9b2a-0e67bd6e8d78)]
[scriptable, uuid(91f635a4-2531-4f3d-89ef-81403a685f44)]
interface nsIFaviconService : nsISupports
{
/**
@ -258,4 +258,9 @@ interface nsIFaviconService : nsISupports
* page on a site that doesn't have a favicon.
*/
boolean isFailedFavicon(in nsIURI aIcon);
/**
* The default favicon URL
*/
readonly attribute nsIURI defaultFavicon;
};

20
toolkit/components/places/src/nsFaviconService.cpp
View File

@ -209,6 +209,19 @@ nsFaviconService::SetFaviconUrlForPage(nsIURI* aPage, nsIURI* aFavicon)
return NS_OK;
}
// nsFaviconService::GetDefaultFavicon
NS_IMETHODIMP
nsFaviconService::GetDefaultFavicon(nsIURI** _retval)
{
// not found, use default
if (!mDefaultIcon) {
nsresult rv = NS_NewURI(getter_AddRefs(mDefaultIcon),
NS_LITERAL_CSTRING(FAVICON_DEFAULT_URL));
NS_ENSURE_SUCCESS(rv, rv);
}
return mDefaultIcon->Clone(_retval);
}
// nsFaviconService::SetFaviconUrlForPageInternal
//
@ -653,12 +666,7 @@ nsFaviconService::GetFaviconImageForPage(nsIURI* aPage, nsIURI** _retval)
}
// not found, use default
if (! mDefaultIcon) {
nsresult rv = NS_NewURI(getter_AddRefs(mDefaultIcon),
NS_LITERAL_CSTRING(FAVICON_DEFAULT_URL));
NS_ENSURE_SUCCESS(rv, rv);
}
return mDefaultIcon->Clone(_retval);
return GetDefaultFavicon(_retval);
}

17
toolkit/components/places/src/nsNavHistory.cpp
View File

@ -219,11 +219,6 @@ static const char* gXpcomShutdown = "xpcom-shutdown";
// annotation names
const char nsNavHistory::kAnnotationPreviousEncoding[] = "history/encoding";
nsIAtom* nsNavHistory::sMenuRootAtom = nsnull;
nsIAtom* nsNavHistory::sToolbarFolderAtom = nsnull;
nsIAtom* nsNavHistory::sSessionStartAtom = nsnull;
nsIAtom* nsNavHistory::sSessionContinueAtom = nsnull;
nsIAtom* nsNavHistory::sContainerAtom = nsnull;
nsNavHistory* nsNavHistory::gHistoryService;
@ -242,12 +237,6 @@ nsNavHistory::nsNavHistory() : mNowValid(PR_FALSE),
#endif
NS_ASSERTION(! gHistoryService, "YOU ARE CREATING 2 COPIES OF THE HISTORY SERVICE. Everything will break.");
gHistoryService = this;
sMenuRootAtom = NS_NewAtom("menu-root");
sToolbarFolderAtom = NS_NewAtom("toolbar-folder");
sSessionStartAtom = NS_NewAtom("session-start");
sSessionContinueAtom = NS_NewAtom("session-continue");
sContainerAtom = NS_NewAtom("container");
}
@ -259,12 +248,6 @@ nsNavHistory::~nsNavHistory()
// in case somebody creates an extra instance of the service.
NS_ASSERTION(gHistoryService == this, "YOU CREATED 2 COPIES OF THE HISTORY SERVICE.");
gHistoryService = nsnull;
NS_IF_RELEASE(sMenuRootAtom);
NS_IF_RELEASE(sToolbarFolderAtom);
NS_IF_RELEASE(sSessionStartAtom);
NS_IF_RELEASE(sSessionContinueAtom);
NS_IF_RELEASE(sContainerAtom);
}

7
toolkit/components/places/src/nsNavHistory.h
View File

@ -47,7 +47,6 @@
#include "nsCOMArray.h"
#include "nsCOMPtr.h"
#include "nsDataHashtable.h"
#include "nsIAtom.h"
#include "nsINavHistoryService.h"
#include "nsIAutoCompleteSearch.h"
#include "nsIAutoCompleteResult.h"
@ -242,12 +241,6 @@ public:
// used in execute queries to get session ID info (only for visits)
static const PRInt32 kGetInfoIndex_SessionId;
static nsIAtom* sMenuRootAtom;
static nsIAtom* sToolbarFolderAtom;
static nsIAtom* sSessionStartAtom;
static nsIAtom* sSessionContinueAtom;
static nsIAtom* sContainerAtom;
// this actually executes a query and gives you results, it is used by
// nsNavHistoryQueryResultNode
nsresult GetQueryResults(const nsCOMArray<nsNavHistoryQuery>& aQueries,

1598
toolkit/components/places/src/nsNavHistoryResult.cpp
View File

File diff suppressed because it is too large Load Diff

60
toolkit/components/places/src/nsNavHistoryResult.h
View File

@ -737,64 +737,4 @@ public:
{ *type = nsNavHistoryResultNode::RESULT_TYPE_SEPARATOR; return NS_OK; }
};
// nsNavHistoryResultTreeViewer
//
class nsNavHistoryResultTreeViewer : public nsINavHistoryResultTreeViewer,
public nsITreeView
{
public:
nsNavHistoryResultTreeViewer();
virtual ~nsNavHistoryResultTreeViewer() {}
NS_DECL_ISUPPORTS
NS_DECL_NSINAVHISTORYRESULTVIEWER
NS_DECL_NSINAVHISTORYRESULTTREEVIEWER
NS_DECL_NSITREEVIEW
protected:
nsRefPtr<nsNavHistoryResult> mResult;
nsCOMPtr<nsITreeBoxObject> mTree; // will be null when no tree attached
nsCOMPtr<nsITreeSelection> mSelection; // may be null
PRBool mCollapseDuplicates;
// This value indicates whether we should try to compute session boundaries.
// It is cached so we don't have to compute it every time we want to get a
// row style.
PRBool mShowSessions;
void ComputeShowSessions();
enum SessionStatus { Session_None, Session_Start, Session_Continue };
SessionStatus GetRowSessionStatus(PRInt32 row);
// This list is used to map rows to nodes.
typedef nsTArray< nsCOMPtr<nsNavHistoryResultNode> > VisibleList;
VisibleList mVisibleElements;
nsresult BuildVisibleList();
nsresult BuildVisibleSection(nsNavHistoryContainerResultNode* aContainer,
VisibleList* aVisible,
PRUint32 aVisibleStartIndex);
PRUint32 CountVisibleRowsForItem(nsNavHistoryResultNode* aNode);
nsresult RefreshVisibleSection(nsNavHistoryContainerResultNode* aContainer);
PRBool CanCollapseDuplicates(nsNavHistoryResultNode* aTop,
nsNavHistoryResultNode* aNext,
PRUint32* aShowThisOne);
// external observers
nsMaybeWeakPtrArray<nsINavHistoryResultViewObserver> mObservers;
nsresult FinishInit();
// columns
enum ColumnType { Column_Unknown = -1, Column_Title, Column_URI, Column_Date,
Column_VisitCount };
ColumnType GetColumnType(nsITreeColumn* col);
ColumnType SortTypeToColumnType(PRUint32 aSortType,
PRBool* aDescending = nsnull);
nsresult FormatFriendlyTime(PRTime aTime, nsAString& aResult);
};
#endif // nsNavHistoryResult_h_

6
toolkit/components/places/src/nsPlacesModule.cpp
View File

@ -8,7 +8,6 @@
#include "nsMorkHistoryImporter.h"
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNavHistory, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsNavHistoryResultTreeViewer)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAnnoProtocolHandler)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAnnotationService, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNavBookmarks, Init)
@ -32,11 +31,6 @@ static const nsModuleComponentInfo components[] =
"@mozilla.org/autocomplete/search;1?name=history",
nsNavHistoryConstructor },
{ "History tree view",
NS_NAVHISTORYRESULTTREEVIEWER_CID,
NS_NAVHISTORYRESULTTREEVIEWER_CONTRACTID,
nsNavHistoryResultTreeViewerConstructor },
{ "Page Annotation Service",
NS_ANNOTATIONSERVICE_CID,
NS_ANNOTATIONSERVICE_CONTRACTID,