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

Make setting document.location to itself not create a new history entry. Bug

Browse Source 
300805, r=biesi, sr=darin, a=bsmedberg
This commit is contained in:
bzbarsky@mit.edu
2005-07-22 18:19:35 +00:00
parent bd665cd259
commit 8f3647ac22
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docshell/base/nsDocShell.cpp
View File

@@ -7034,10 +7034,11 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel,
/* If the url to be loaded is the same as the one already there,
* and the original loadType is LOAD_NORMAL or LOAD_LINK,
* set loadType to LOAD_NORMAL_REPLACE so that AddToSessionHistory()
* won't mess with the current SHEntry and if this page has any frame
* children, it also will be handled properly. see bug 83684
* and the original loadType is LOAD_NORMAL, LOAD_LINK, or
* LOAD_STOP_CONTENT, set loadType to LOAD_NORMAL_REPLACE so that
* AddToSessionHistory() won't mess with the current SHEntry and
* if this page has any frame children, it also will be handled
* properly. see bug 83684
*
* XXX Hopefully changing the loadType at this time will not hurt
* anywhere. The other way to take care of sequentially repeating
@@ -7046,7 +7047,8 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel,
*/
if (equalUri &&
(mLoadType == LOAD_NORMAL ||
mLoadType == LOAD_LINK) &&
mLoadType == LOAD_LINK ||
mLoadType == LOAD_STOP_CONTENT) &&
!inputStream)
{
mLoadType = LOAD_NORMAL_REPLACE;