зеркало из https://github.com/mozilla/gecko-dev.git
Bug 296720 Can't get to links using FastFind (Ctrl+F) r+a=mconnor
This commit is contained in:
Родитель
f26e452469
Коммит
d03ab2a7fd
|
@ -50,6 +50,7 @@ var gFindMode = FIND_NORMAL;
|
||||||
var gFoundLink = null;
|
var gFoundLink = null;
|
||||||
var gTmpOutline = null;
|
var gTmpOutline = null;
|
||||||
var gTmpOutlineOffset = "0";
|
var gTmpOutlineOffset = "0";
|
||||||
|
var gDrawOutline = false;
|
||||||
var gQuickFindTimeout = null;
|
var gQuickFindTimeout = null;
|
||||||
var gQuickFindTimeoutLength = 0;
|
var gQuickFindTimeoutLength = 0;
|
||||||
var gHighlightTimeout = null;
|
var gHighlightTimeout = null;
|
||||||
|
@ -103,6 +104,9 @@ function initFindBar()
|
||||||
pbi.addObserver(gTypeAheadFind.searchLinksPref, gTypeAheadFind, false);
|
pbi.addObserver(gTypeAheadFind.searchLinksPref, gTypeAheadFind, false);
|
||||||
gUseTypeAheadFind = prefService.getBoolPref("accessibility.typeaheadfind");
|
gUseTypeAheadFind = prefService.getBoolPref("accessibility.typeaheadfind");
|
||||||
gTypeAheadLinksOnly = prefService.getBoolPref("accessibility.typeaheadfind.linksonly");
|
gTypeAheadLinksOnly = prefService.getBoolPref("accessibility.typeaheadfind.linksonly");
|
||||||
|
|
||||||
|
var fastFind = getBrowser().fastFind;
|
||||||
|
fastFind.focusLinks = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function uninitFindBar()
|
function uninitFindBar()
|
||||||
|
@ -345,12 +349,13 @@ function setFoundLink(foundLink)
|
||||||
if (gFoundLink == foundLink)
|
if (gFoundLink == foundLink)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (gFoundLink) {
|
if (gFoundLink && gDrawOutline) {
|
||||||
// restore original outline
|
// restore original outline
|
||||||
gFoundLink.style.outline = gTmpOutline;
|
gFoundLink.style.outline = gTmpOutline;
|
||||||
gFoundLink.style.outlineOffset = gTmpOutlineOffset;
|
gFoundLink.style.outlineOffset = gTmpOutlineOffset;
|
||||||
}
|
}
|
||||||
if (foundLink) {
|
gDrawOutline = (foundLink && gFindMode != FIND_NORMAL);
|
||||||
|
if (gDrawOutline) {
|
||||||
// backup original outline
|
// backup original outline
|
||||||
gTmpOutline = foundLink.style.outline;
|
gTmpOutline = foundLink.style.outline;
|
||||||
gTmpOutlineOffset = foundLink.style.outlineOffset;
|
gTmpOutlineOffset = foundLink.style.outlineOffset;
|
||||||
|
@ -358,7 +363,7 @@ function setFoundLink(foundLink)
|
||||||
// XXX Should we change the following style for FAYT pseudo focus?
|
// XXX Should we change the following style for FAYT pseudo focus?
|
||||||
// XXX Shouldn't we change default design if outline is visible already?
|
// XXX Shouldn't we change default design if outline is visible already?
|
||||||
foundLink.style.outline = "1px dotted invert";
|
foundLink.style.outline = "1px dotted invert";
|
||||||
foundLink.style.outlineOffset = "0;";
|
foundLink.style.outlineOffset = "0";
|
||||||
}
|
}
|
||||||
|
|
||||||
gFoundLink = foundLink;
|
gFoundLink = foundLink;
|
||||||
|
@ -544,13 +549,11 @@ function enableFindButtons(aEnable)
|
||||||
|
|
||||||
function updateFoundLink(res)
|
function updateFoundLink(res)
|
||||||
{
|
{
|
||||||
if (gFindMode != FIND_NORMAL) {
|
var val = document.getElementById("find-field").value;
|
||||||
var val = document.getElementById("find-field").value;
|
if (res == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND || !val)
|
||||||
if (res == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND || !val)
|
setFoundLink(null);
|
||||||
setFoundLink(null);
|
else
|
||||||
else
|
setFoundLink(getBrowser().fastFind.foundLink);
|
||||||
setFoundLink(getBrowser().fastFind.foundLink);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function find(val)
|
function find(val)
|
||||||
|
@ -752,6 +755,4 @@ function setFindMode(mode)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
gFindMode = mode;
|
gFindMode = mode;
|
||||||
var fastFind = getBrowser().fastFind;
|
|
||||||
fastFind.focusLinks = (gFindMode != FIND_NORMAL);
|
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче