bug 22342, r=danm, back out ben's hack to try to load URL in current window if empty otherwise load in a new window, now always load using openTopWin()

This commit is contained in:
pchen%netscape.com 2006-09-14 05:52:33 +00:00
Родитель b7c5068331
Коммит bfd0079f1c
1 изменённых файлов: 1 добавлений и 4 удалений

Просмотреть файл

@ -71,7 +71,6 @@ catch (ex)
// focused frame URL
var gFocusedURL = null;
var gNavigated = -1;
/**
* Save the document at a given location to disk
@ -99,7 +98,6 @@ function savePage( url )
**/
function getContentAreaFrameCount()
{
gNavigated++;
var saveFrameItem = document.getElementById("savepage");
if (!window._content.frames.length ||
!isDocumentFrame(document.commandDispatcher.focusedWindow))
@ -929,8 +927,7 @@ function RevealSearchPanel()
fp.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterText |
nsIFilePicker.filterAll | nsIFilePicker.filterImages | nsIFilePicker.filterXML);
if (fp.show() == nsIFilePicker.returnOK) {
var fn = !gNavigated ? openTopWin : openNewWindowWith;
fn(fp.fileURL.spec);
openTopWin(fp.fileURL.spec);
}
} catch (ex) { }
}