Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 05:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't fire popup blocked event if we decide to open the content in an existing named window (bug 174765 refinement)

Browse Source 
r=danm, sr=jag, a=roc
This commit is contained in:
dveditz%netscape.com 2002-11-01 05:20:07 +00:00
parent b1f8d6156c
commit 27878120f5
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dom/src/base/nsGlobalWindow.cpp
View File

@ -2871,10 +2871,7 @@ GlobalWindowImpl::CheckForAbusePoint ()
return PR_FALSE;
if (!mIsDocumentLoaded || mRunningTimeout) {
PRBool blocked = IsPopupBlocked(mDocument);
if (blocked)
FirePopupBlockedEvent(mDocument);
return blocked;
return IsPopupBlocked(mDocument);
}
PRInt32 clickDelay = 0;
@ -2886,12 +2883,8 @@ GlobalWindowImpl::CheckForAbusePoint ()
LL_SUB(ll_delta, now, mLastMouseButtonAction);
LL_L2I(delta, ll_delta);
delta /= 1000;
if (delta > clickDelay)
{
PRBool blocked = IsPopupBlocked(mDocument);
if (blocked)
FirePopupBlockedEvent(mDocument);
return blocked;
if (delta > clickDelay) {
return IsPopupBlocked(mDocument);
}
}
@ -2955,6 +2948,7 @@ GlobalWindowImpl::Open(nsIDOMWindow **_retval)
*/
if (CheckForAbusePoint()) {
if (name.IsEmpty()) {
FirePopupBlockedEvent(mDocument);
return NS_OK;
}
@ -2968,6 +2962,7 @@ GlobalWindowImpl::Open(nsIDOMWindow **_retval)
getter_AddRefs(namedWindow));
if (!namedWindow) {
FirePopupBlockedEvent(mDocument);
return NS_OK;
}
}