From e74ffb7257f07a9a329d3bec4252b81588ffe4d3 Mon Sep 17 00:00:00 2001 From: "mozilla.mano%sent.com" Date: Fri, 1 Dec 2006 12:19:26 +0000 Subject: [PATCH] Bug 343077 - Find Again toolbarbutton doesn't switch back to normal-find if the findbar is opened after links TAF. r=masayuki. --- .../components/typeaheadfind/public/nsITypeAheadFind.idl | 4 ++-- toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp | 8 +++++--- toolkit/content/widgets/findbar.xml | 7 +++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/toolkit/components/typeaheadfind/public/nsITypeAheadFind.idl b/toolkit/components/typeaheadfind/public/nsITypeAheadFind.idl index 85c56d45d5e..b085c97fad0 100755 --- a/toolkit/components/typeaheadfind/public/nsITypeAheadFind.idl +++ b/toolkit/components/typeaheadfind/public/nsITypeAheadFind.idl @@ -51,7 +51,7 @@ interface nsIDocShell; /****************************** nsTypeAheadFind ******************************/ -[scriptable, uuid(e6a9966a-5fc8-41a4-9d9d-9c15e9664c45)] +[scriptable, uuid(1280e20d-d739-45cc-980b-182abda4fbe0)] interface nsITypeAheadFind : nsISupports { /****************************** Initializer ******************************/ @@ -70,7 +70,7 @@ interface nsITypeAheadFind : nsISupports unsigned short find(in AString aSearchString, in boolean aLinksOnly, in boolean aHasFocus); /* Find another match in the page. */ - unsigned short findAgain(in boolean findBackwards, in boolean aHasFocus); + unsigned short findAgain(in boolean findBackwards, in boolean aLinksOnly, in boolean aHasFocus); /**************************** Helper functions ***************************/ diff --git a/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp b/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp index 40ff07ff1ed..859879cc502 100755 --- a/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp +++ b/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp @@ -868,13 +868,15 @@ nsTypeAheadFind::RangeStartsInsideLink(nsIDOMRange *aRange, *aIsStartingLink = PR_FALSE; } -NS_IMETHODIMP -nsTypeAheadFind::FindAgain(PRBool aFindBackwards, PRBool aHasFocus, - PRUint16* aResult) /* Find another match in the page. */ +NS_IMETHODIMP +nsTypeAheadFind::FindAgain(PRBool aFindBackwards, PRBool aLinksOnly, + PRBool aHasFocus, PRUint16* aResult) + { *aResult = FIND_NOTFOUND; + mLinksOnly = aLinksOnly; if (!mTypeAheadBuffer.IsEmpty()) FindItNow(nsnull, mLinksOnly, PR_FALSE, aFindBackwards, aHasFocus, aResult); diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml index a72158a34e4..f9d47ffa40a 100644 --- a/toolkit/content/widgets/findbar.xml +++ b/toolkit/content/widgets/findbar.xml @@ -1113,8 +1113,11 @@