mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 10d66191e16a because commit message fail. r=we-need-hooks

This commit is contained in:
Blair McBride 2014-09-19 17:53:11 +12:00
Родитель 49e1a67e44
Коммит 80c5c0d00a
6 изменённых файлов: 77 добавлений и 307 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

231
toolkit/components/places/UnifiedComplete.js
Просмотреть файл

@ -666,57 +666,47 @@ Search.prototype = {
// wait for the initialization of PlacesSearchAutocompleteProvider first.
yield PlacesSearchAutocompleteProvider.ensureInitialized();
// For any given search, we run many queries/heuristics:
// 1) by alias (as defined in SearchService)
// 2) inline completion from search engine resultDomains
// 3) inline completion for hosts (this._hostQuery) or urls (this._urlQuery)
// 4) directly typed in url (ie, can be navigated to as-is)
// 5) submission for the current search engine
// 6) keywords (this._keywordQuery)
// 7) adaptive learning (this._adaptiveQuery)
// 8) open pages not supported by history (this._switchToTabQuery)
// 9) query based on match behavior
// For any given search, we run many queries:
// 1) search engine domains
// 2) inline completion
// 3) keywords (this._keywordQuery)
// 4) adaptive learning (this._adaptiveQuery)
// 5) open pages not supported by history (this._switchToTabQuery)
// 6) query based on match behavior
//
// (6) only gets ran if we get any filtered tokens, since if there are no
// tokens, there is nothing to match. This is the *first* query we check if
// we want to run, but it gets queued to be run later.
//
// (1), (4), (5) only get run if actions are enabled. When actions are
// enabled, the first result is always a special result (resulting from one
// of the queries between (1) and (6) inclusive). As such, the UI is
// expected to auto-select the first result when actions are enabled. If the
// first result is an inline completion result, that will also be the
// default result and therefore be autofilled (this also happens if actions
// are not enabled).
// (3) only gets ran if we get any filtered tokens, since if there are no
// tokens, there is nothing to match.
// Get the final query, based on the tokens found in the search string.
let queries = [ this._adaptiveQuery,
this._switchToTabQuery,
this._searchQuery ];
// When actions are enabled, we run a series of heuristics to determine what
// the first result should be - which is always a special result.
// |hasFirstResult| is used to keep track of whether we've obtained such a
// result yet, so we can skip further heuristics and not add any additional
// special results.
let hasFirstResult = false;
let hasKeyword = false;
if (this._searchTokens.length > 0 &&
PlacesUtils.bookmarks.getURIForKeyword(this._searchTokens[0])) {
// This may be a keyword of a bookmark.
queries.unshift(this._keywordQuery);
hasFirstResult = true;
hasKeyword = true;
}
let shouldAutofill = this._shouldAutofill;
if (this.pending && !hasFirstResult && shouldAutofill) {
// Or it may look like a URL we know about from search engines.
hasFirstResult = yield this._matchSearchEngineUrl();
}
if (this._shouldAutofill) {
if (this._searchTokens.length == 1 && !hasKeyword)
yield this._matchSearchEngineUrl();
if (this.pending && !hasFirstResult && shouldAutofill) {
// It may also look like a URL we know from the database.
hasFirstResult = yield this._matchKnownUrl(conn, queries);
// Hosts have no "/" in them.
let lastSlashIndex = this._searchString.lastIndexOf("/");
// Search only URLs if there's a slash in the search string...
if (lastSlashIndex != -1) {
// ...but not if it's exactly at the end of the search string.
if (lastSlashIndex < this._searchString.length - 1) {
queries.unshift(this._urlQuery);
}
} else if (this.pending) {
// The host query is executed immediately, while any other is delayed
// to avoid overloading the connection.
let [ query, params ] = this._hostQuery;
yield conn.executeCached(query, params, this._onResultRow.bind(this));
}
}
yield this._sleep(Prefs.delay);
@ -750,90 +740,54 @@ Search.prototype = {
}
}),
_matchKnownUrl: function* (conn, queries) {
// Hosts have no "/" in them.
let lastSlashIndex = this._searchString.lastIndexOf("/");
// Search only URLs if there's a slash in the search string...
if (lastSlashIndex != -1) {
// ...but not if it's exactly at the end of the search string.
if (lastSlashIndex < this._searchString.length - 1) {
// We don't want to execute this query right away because it needs to
// search the entire DB without an index, but we need to know if we have
// a result as it will influence other heuristics. So we guess by
// assuming that if we get a result from a *host* query and it *looks*
// like a URL, then we'll probably have a result.
let gotResult = false;
let [ query, params ] = this._urlPredictQuery;
yield conn.executeCached(query, params, row => {
gotResult = true;
queries.unshift(this._urlQuery);
});
return gotResult;
}
return false;
}
let gotResult = false;
let [ query, params ] = this._hostQuery;
yield conn.executeCached(query, params, row => {
gotResult = true;
this._onResultRow(row);
});
return gotResult;
},
_matchSearchEngineUrl: function* () {
if (!Prefs.autofillSearchEngines)
return false;
return;
let match = yield PlacesSearchAutocompleteProvider.findMatchByToken(
this._searchString);
if (!match)
return false;
if (match) {
// The match doesn't contain a 'scheme://www.' prefix, but since we have
// stripped it from the search string, here we could still be matching
// 'https://www.g' to 'google.com'.
// There are a couple cases where we don't want to match though:
//
// * If the protocol differs we should not match. For example if the user
// searched https we should not return http.
try {
let prefixURI = NetUtil.newURI(this._strippedPrefix);
let finalURI = NetUtil.newURI(match.url);
if (prefixURI.scheme != finalURI.scheme)
return;
} catch (e) {}
// The match doesn't contain a 'scheme://www.' prefix, but since we have
// stripped it from the search string, here we could still be matching
// 'https://www.g' to 'google.com'.
// There are a couple cases where we don't want to match though:
//
// * If the protocol differs we should not match. For example if the user
// searched https we should not return http.
try {
let prefixURI = NetUtil.newURI(this._strippedPrefix);
let finalURI = NetUtil.newURI(match.url);
if (prefixURI.scheme != finalURI.scheme)
return false;
} catch (e) {}
// * If the user typed "www." but the final url doesn't have it, we
// should not match as well, the two urls may point to different pages.
if (this._strippedPrefix.endsWith("www.") &&
!stripHttpAndTrim(match.url).startsWith("www."))
return;
// * If the user typed "www." but the final url doesn't have it, we
// should not match as well, the two urls may point to different pages.
if (this._strippedPrefix.endsWith("www.") &&
!stripHttpAndTrim(match.url).startsWith("www."))
return false;
let value = this._strippedPrefix + match.token;
let value = this._strippedPrefix + match.token;
// In any case, we should never arrive here with a value that doesn't
// match the search string. If this happens there is some case we
// are not handling properly yet.
if (!value.startsWith(this._originalSearchString)) {
Components.utils.reportError(`Trying to inline complete in-the-middle
${this._originalSearchString} to ${value}`);
return;
}
// In any case, we should never arrive here with a value that doesn't
// match the search string. If this happens there is some case we
// are not handling properly yet.
if (!value.startsWith(this._originalSearchString)) {
Components.utils.reportError(`Trying to inline complete in-the-middle
${this._originalSearchString} to ${value}`);
return false;
this._result.setDefaultIndex(0);
this._addFrecencyMatch({
value: value,
comment: match.engineName,
icon: match.iconUrl,
style: "priority-search",
finalCompleteValue: match.url,
frecency: FRECENCY_SEARCHENGINES_DEFAULT
});
}
this._result.setDefaultIndex(0);
this._addFrecencyMatch({
value: value,
comment: match.engineName,
icon: match.iconUrl,
style: "priority-search",
finalCompleteValue: match.url,
frecency: FRECENCY_SEARCHENGINES_DEFAULT
});
return true;
},
_onResultRow: function (row) {
@ -963,7 +917,6 @@ Search.prototype = {
let trimmedHost = row.getResultByIndex(QUERYINDEX_URL);
let untrimmedHost = row.getResultByIndex(QUERYINDEX_TITLE);
let frecency = row.getResultByIndex(QUERYINDEX_FRECENCY);
// If the untrimmed value doesn't preserve the user's input just
// ignore it and complete to the found host.
if (untrimmedHost &&
@ -975,19 +928,7 @@ Search.prototype = {
// Remove the trailing slash.
match.comment = stripHttpAndTrim(trimmedHost);
match.finalCompleteValue = untrimmedHost;
try {
let iconURI = NetUtil.newURI(untrimmedHost);
iconURI.path = "/favicon.ico";
match.icon = PlacesUtils.favicons.getFaviconLinkForIcon(iconURI).spec;
} catch (e) {
// This can fail, which is ok.
}
// Although this has a frecency, this query is executed before any other
// queries that would result in frecency matches.
match.frecency = frecency;
match.style = "autofill";
return match;
},
@ -1021,10 +962,7 @@ Search.prototype = {
match.value = this._strippedPrefix + url;
match.comment = url;
match.finalCompleteValue = untrimmedURL;
// Although this has a frecency, this query is executed before any other
// queries that would result in frecency matches.
match.frecency = frecency;
match.style = "autofill";
return match;
},
@ -1224,9 +1162,6 @@ Search.prototype = {
if (!Prefs.autofill)
return false;
if (!this._searchTokens.length == 1)
return false;
// Then, we should not try to autofill if the behavior is not the default.
// TODO (bug 751709): Ideally we should have a more fine-grained behavior
// here, but for now it's enough to just check for default behavior.
@ -1247,11 +1182,18 @@ Search.prototype = {
// This may confuse completeDefaultIndex cause the AUTOCOMPLETE_MATCH
// tokenizer ends up trimming the search string and returning a value
// that doesn't match it, or is even shorter.
if (/\s/.test(this._originalSearchString))
if (/\s/.test(this._originalSearchString)) {
return false;
}
if (this._searchString.length == 0)
// Don't autoFill if the search term is recognized as a keyword, otherwise
// it will override default keywords behavior. Note that keywords are
// hashed on first use, so while the first query may delay a little bit,
// next ones will just hit the memory hash.
if (this._searchString.length == 0 ||
PlacesUtils.bookmarks.getURIForKeyword(this._searchString)) {
return false;
}
return true;
},
@ -1278,29 +1220,6 @@ Search.prototype = {
];
},
/**
* Obtains a query to predict whether this._urlQuery is likely to return a
* result. We do by extracting what should be a host out of the input and
* performing a host query based on that.
*/
get _urlPredictQuery() {
// We expect this to be a full URL, not just a host. We want to extract the
// host and use that as a guess for whether we'll get a result from a URL
// query.
let slashIndex = this._searchString.indexOf("/");
let host = this._searchString.substring(0, slashIndex);
host = host.toLowerCase();
return [
SQL_HOST_QUERY,
{
query_type: QUERYTYPE_AUTOFILL_HOST,
searchString: host
}
];
},
/**
* Obtains the query to search for autoFill url results.
*

121
toolkit/content/widgets/autocomplete.xml
Просмотреть файл

@ -1442,107 +1442,6 @@ extends="chrome://global/content/bindings/popup.xml#popup">
</body>
</method>
<!--
This will generate an array of emphasis pairs for use with
_setUpEmphasisedSections(). Each pair is a tuple (array) that
represents a block of text - containing the text of that block, and a
boolean for whether that block should have an emphasis styling applied
to it.
These pairs are generated by parsing a localised string (aSourceString)
with parameters, in the format that is used by
nsIStringBundle.formatStringFromName():
"textA %1$S textB textC %2$S"
Or:
"textA %S"
Where "%1$S", "%2$S", and "%S" are intended to be replaced by provided
replacement strings. These are specified an array of tuples
(aReplacements), each containing the replacement text and a boolean for
whether that text should have an emphasis styling applied. This is used
as a 1-based array - ie, "%1$S" is replaced by the item in the first
index of aReplacements, "%2$S" by the second, etc. "%S" will always
match the first index.
-->
<method name="_generateEmphasisPairs">
<parameter name="aSourceString"/>
<parameter name="aReplacements"/>
<body>
<![CDATA[
let pairs = [];
// Split on %S, %1$S, %2$S, etc. ie:
// "textA %S"
// becomes ["textA ", "%S"]
// "textA %1$S textB textC %2$S"
// becomes ["textA ", "%1$S", " textB textC ", "%2$S"]
let parts = aSourceString.split(/(%(?:[0-9]+\$)?S)/);
for (let part of parts) {
// The above regex will actually give us an empty string at the
// end - we don't want that, as we don't want to later generate an
// empty text node for it.
if (part.length === 0)
continue;
// Determine if this token is a replacement token or a normal text
// token. If it is a replacement token, we want to extract the
// numerical number. However, we still want to match on "$S".
let match = part.match(/^%(?:([0-9]+)\$)?S$/);
if (match) {
// "%S" doesn't have a numerical number in it, but will always
// be assumed to be 1. Furthermore, the input string specifies
// these with a 1-based index, but we want a 0-based index.
let index = (match[1] || 1) - 1;
if (index >= 0 && index < aReplacements.length) {
let replacement = aReplacements[index];
pairs.push([...replacement]);
}
} else {
pairs.push([part, false]);
}
}
return pairs;
]]>
</body>
</method>
<!--
_setUpEmphasisedSections() has the same use as _setUpDescription,
except instead of taking a string and highlighting given tokens, it takes
an array of pairs generated by _generateEmphasisPairs(). This allows
control over emphasising based on specific blocks of text, rather than
search for substrings.
-->
<method name="_setUpEmphasisedSections">
<parameter name="aDescriptionElement"/>
<parameter name="aTextPairs"/>
<body>
<![CDATA[
// Get rid of all previous text
while (aDescriptionElement.hasChildNodes())
aDescriptionElement.firstChild.remove();
for (let [text, emphasise] of aTextPairs) {
if (emphasise) {
let span = aDescriptionElement.appendChild(
document.createElementNS("http://www.w3.org/1999/xhtml", "span"));
span.className = "ac-emphasize-text";
span.textContent = text;
} else {
aDescriptionElement.appendChild(document.createTextNode(text));
}
}
]]>
</body>
</method>
<method name="_adjustAcItem">
<body>
<![CDATA[
@ -1599,20 +1498,6 @@ extends="chrome://global/content/bindings/popup.xml#popup">
types.delete("search");
}
// Check if we have an auto-fill URL
if (types.has("autofill")) {
emphasiseUrl = false;
let sourceStr = this._stringBundle.GetStringFromName("visitURL");
title = this._generateEmphasisPairs(sourceStr, [
[trimURL(url), true],
]);
types.delete("autofill");
}
type = [...types].join(" ");
// If we have a tag match, show the tags and icon
if (type == "tag") {
// Configure the extra box for tags display
@ -1668,11 +1553,7 @@ extends="chrome://global/content/bindings/popup.xml#popup">
title = url;
// Emphasize the matching search terms for the description
if (Array.isArray(title))
this._setUpEmphasisedSections(this._title, title);
else
this._setUpDescription(this._title, title, !emphasiseTitle);
this._setUpDescription(this._title, title, !emphasiseTitle);
this._setUpDescription(this._url, url, !emphasiseUrl);
// Set up overflow on a timeout because the contents of the box

5
toolkit/locales/en-US/chrome/global/autocomplete.properties
Просмотреть файл

@ -6,7 +6,4 @@
# the search engine provider's name. This format was chosen because
# the provider can also end with "Search" (e.g.: MSN Search).
searchWithEngine = Search with %S
switchToTab = Switch to tab
# LOCALIZATION NOTE (visitURL):
# %S is the URL to visit.
visitURL = Visit %S
switchToTab = Switch to tab

9
toolkit/themes/linux/global/autocomplete.css
Просмотреть файл

@ -117,15 +117,6 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
color: MenuText;
}
.autocomplete-richlistitem[type~="autofill"] .ac-url-box {
display: none;
}
.autocomplete-richlistitem[type~="autofill"] .ac-title-box {
margin-top: 12px;
margin-bottom: 12px;
}
.ac-url-box {
margin-top: 1px;
}

9
toolkit/themes/osx/global/autocomplete.css
Просмотреть файл

@ -102,15 +102,6 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
padding: 5px 2px;
}
.autocomplete-richlistitem[type~="autofill"] .ac-url-box {
display: none;
}
.autocomplete-richlistitem[type~="autofill"] .ac-title-box {
margin-top: 12px;
margin-bottom: 12px;
}
.ac-url-box {
margin-top: 1px;
}

9
toolkit/themes/windows/global/autocomplete.css
Просмотреть файл

@ -130,15 +130,6 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
}
%endif
.autocomplete-richlistitem[type~="autofill"] .ac-url-box {
display: none;
}
.autocomplete-richlistitem[type~="autofill"] .ac-title-box {
margin-top: 12px;
margin-bottom: 12px;
}
.ac-title-box {
margin-top: 4px;
}