corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed: Links now work.

Browse Source 
Fixed: Selection cursor no longer shows when clicking on a link.
(These are the same fixes as Stability branch bugs 312562 and 312563)
This commit is contained in:
rods@netscape.com
1998-08-06 16:29:45 +00:00
parent 691f92ed67
commit a23d1a1dbd
3 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
layout/base/src/nsFrame.cpp
View File

@@ -40,10 +40,6 @@
#include "nsIDeviceContext.h"
#include "nsIPresShell.h"
#if THIS_IS_THE_LINK_FIX
#include "nsHTMLAtoms.h"
#endif
// Some Misc #defines
#define SELECTION_DEBUG 0
#define FORCE_SELECTION_UPDATE 1
@@ -582,28 +578,6 @@ NS_METHOD nsFrame::HandleEvent(nsIPresContext& aPresContext,
if(nsEventStatus_eConsumeNoDefault != aEventStatus) {
if (aEvent->message == NS_MOUSE_LEFT_BUTTON_DOWN) {
#if THIS_IS_THE_LINK_FIX
nsIContent * content = mContent;
nsIAtom * atom = content->GetTag();
NS_ADDREF(content);
while (atom == nsnull) {
nsIContent * oldContent = content;
content = oldContent->GetParent();
NS_RELEASE(oldContent);
atom = content->GetTag();
}
NS_RELEASE(content);
if (atom == nsHTMLAtoms::a) {
nsString href;
content->GetAttribute(nsString("href"), href);
if (href.Length() > 0) {
NS_RELEASE(atom);
return NS_OK;
}
}
NS_RELEASE(atom);
#endif
} else if (aEvent->message == NS_MOUSE_MOVE && mDoingSelection ||
aEvent->message == NS_MOUSE_LEFT_BUTTON_UP) {
// no-op

14
layout/generic/nsHTMLContainerFrame.cpp
View File

@@ -95,6 +95,20 @@ NS_METHOD nsHTMLContainerFrame::HandleEvent(nsIPresContext& aPresContext,
nsGUIEvent* aEvent,
nsEventStatus& aEventStatus)
{
// This masks out selection on the down click
if (aEvent->message == NS_MOUSE_LEFT_BUTTON_DOWN) {
nsIAtom* tag = mContent->GetTag();
if (nsHTMLAtoms::a == tag) {
nsString href;
mContent->GetAttribute(nsString("href"), href);
if (href.Length() > 0) {
NS_RELEASE(tag);
return NS_OK;
}
}
NS_RELEASE(tag);
}
return nsContainerFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
}

14
layout/html/base/src/nsHTMLContainerFrame.cpp
View File

@@ -95,6 +95,20 @@ NS_METHOD nsHTMLContainerFrame::HandleEvent(nsIPresContext& aPresContext,
nsGUIEvent* aEvent,
nsEventStatus& aEventStatus)
{
// This masks out selection on the down click
if (aEvent->message == NS_MOUSE_LEFT_BUTTON_DOWN) {
nsIAtom* tag = mContent->GetTag();
if (nsHTMLAtoms::a == tag) {
nsString href;
mContent->GetAttribute(nsString("href"), href);
if (href.Length() > 0) {
NS_RELEASE(tag);
return NS_OK;
}
}
NS_RELEASE(tag);
}
return nsContainerFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
}