Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 418257 - Show what part of which tags match for urlbar autocomplete. r=dietrich, r=gavin, ui-r=beltzner, b-ff3=beltzner, a1.9=mconnor

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@250105 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edward.lee%engineering.uiuc.edu
2008-04-12 03:14:44 +00:00
parent eddc1b0f58
commit 7d7aebc8d8
12 changed files with 349 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/browser/themes/gnomestripe/browser/browser.css
View File

@@ -1029,6 +1029,10 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
font-size: 1.15em;
}
.ac-extra > .ac-comment {
font-size: inherit;
}
.ac-url-text {
color: GrayText;
}

4
mozilla/browser/themes/pinstripe/browser/browser.css
View File

@@ -793,6 +793,10 @@ statusbarpanel#statusbar-display {
font-size: 1.15em;
}
.ac-extra > .ac-comment {
font-size: inherit;
}
.ac-url-text {
color: #336633;
}

4
mozilla/browser/themes/winstripe/browser/browser.css
View File

@@ -1139,6 +1139,10 @@ statusbarpanel#statusbar-display {
font-size: 1.15em;
}
.ac-extra > .ac-comment {
font-size: inherit;
}
.ac-url-text {
color: #336633;
}

7
mozilla/toolkit/components/places/src/nsNavHistoryAutoComplete.cpp
View File

@@ -99,6 +99,11 @@
SQL_STR_FRAGMENT_GET_BOOK_TAG("bookmark", "b.title", "!=", PR_TRUE) + \
SQL_STR_FRAGMENT_GET_BOOK_TAG("tags", "GROUP_CONCAT(t.title, ',')", "=", PR_FALSE))
// This separator is used as an RTL-friendly way to split the title and tags.
// It can also be used by an nsIAutoCompleteResult consumer to re-split the
// "comment" back into the title and tag.
NS_NAMED_LITERAL_STRING(kTitleTagsSeparator, " \u2013 ");
////////////////////////////////////////////////////////////////////////////////
//// nsNavHistoryAutoComplete Helper Functions
@@ -748,10 +753,8 @@ nsNavHistory::AutoCompleteProcessSearch(mozIStorageStatement* aQuery,
PRBool showTags = !entryTags.IsEmpty();
// Add the tags to the title if necessary
/* XXX bug 418257 to look at RTL issues of appending tags
if (showTags)
title += kTitleTagsSeparator + entryTags;
*/
// Tags have a special style to show a tag icon; otherwise, style the
// bookmarks that aren't feed items and feed URIs as bookmark

2
mozilla/toolkit/components/places/tests/unit/test_416211.js
View File

@@ -230,5 +230,5 @@ addPageBook(0, 0, 1, [2]);
// optional function
let gTests = [
["0: Make sure the tag match gives the bookmark title",
theTag, [[0,1]]],
theTag, [[0,1,[2]]]],
];

2
mozilla/toolkit/components/places/tests/unit/test_416214.js
View File

@@ -239,5 +239,5 @@ addPageBook(1, 0, 0, [1]);
// optional function
let gTests = [
["0: Make sure tag matches return the right url as well as '+' remain escaped",
theTag, [[0,0],[1,0]]],
theTag, [[0,0,[1]],[1,0,[1]]]],
];

253
mozilla/toolkit/components/places/tests/unit/test_418257.js Normal file
View File

@@ -0,0 +1,253 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Places Test Code.
*
* The Initial Developer of the Original Code is
* Edward Lee <edward.lee@engineering.uiuc.edu>.
* Portions created by the Initial Developer are Copyright (C) 2008
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/**
* Test bug 418257 by making sure tags are returned with the title as part of
* the "comment" if there are tags even if we didn't match in the tags. They
* are separated from the title by a endash.
*/
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
let current_test = 0;
function AutoCompleteInput(aSearches) {
this.searches = aSearches;
}
AutoCompleteInput.prototype = {
timeout: 10,
textValue: "",
searches: null,
searchParam: "",
popupOpen: false,
minResultsForPopup: 0,
invalidate: function() {},
disableAutoComplete: false,
completeDefaultIndex: false,
get popup() { return this; },
onSearchBegin: function() {},
onSearchComplete: function() {},
setSelectedIndex: function() {},
get searchCount() { return this.searches.length; },
getSearchAt: function(aIndex) this.searches[aIndex],
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteInput, Ci.nsIAutoCompletePopup])
};
function ensure_results(aSearch, aExpected)
{
let controller = Cc["@mozilla.org/autocomplete/controller;1"].
getService(Ci.nsIAutoCompleteController);
// Make an AutoCompleteInput that uses our searches
// and confirms results on search complete
let input = new AutoCompleteInput(["history"]);
controller.input = input;
let numSearchesStarted = 0;
input.onSearchBegin = function() {
numSearchesStarted++;
do_check_eq(numSearchesStarted, 1);
};
input.onSearchComplete = function() {
do_check_eq(numSearchesStarted, 1);
aExpected = aExpected.slice();
// Check to see the expected uris and titles match up (in any order)
for (let i = 0; i < controller.matchCount; i++) {
let value = controller.getValueAt(i);
let comment = controller.getCommentAt(i);
print("Looking for an expected result of " + value + ", " + comment + "...");
let j;
for (j = 0; j < aExpected.length; j++) {
let [uri, title, tags] = gPages[aExpected[j]];
// Skip processed expected results
if (uri == undefined) continue;
// Load the real uri and titles and tags if necessary
uri = iosvc.newURI(kURIs[uri], null, null).spec;
title = kTitles[title];
if (tags)
title += " \u2013 " + tags.map(function(aTag) kTitles[aTag]);
// Got a match on both uri and title?
if (uri == value && title == comment) {
print("Got it at index " + j + "!!");
// Make it undefined so we don't process it again
aExpected[j] = [];
break;
}
}
// We didn't hit the break, so we must have not found it
if (j == aExpected.length)
do_throw("Didn't find the current result (" + value + ", " + comment + ") in expected: " + aExpected);
}
// Make sure we have the right number of results
do_check_eq(controller.matchCount, aExpected.length);
// If we expect results, make sure we got matches
do_check_eq(controller.searchStatus, aExpected.length ?
Ci.nsIAutoCompleteController.STATUS_COMPLETE_MATCH :
Ci.nsIAutoCompleteController.STATUS_COMPLETE_NO_MATCH);
// Fetch the next test if we have more
if (++current_test < gTests.length)
run_test();
do_test_finished();
};
print("Searching for.. " + aSearch);
controller.startSearch(aSearch);
}
// Get history services
try {
var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].
getService(Ci.nsINavHistoryService);
var bhist = histsvc.QueryInterface(Ci.nsIBrowserHistory);
var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
getService(Ci.nsINavBookmarksService);
var tagsvc = Cc["@mozilla.org/browser/tagging-service;1"].
getService(Ci.nsITaggingService);
var iosvc = Cc["@mozilla.org/network/io-service;1"].
getService(Ci.nsIIOService);
} catch(ex) {
do_throw("Could not get services\n");
}
// Some date not too long ago
let gDate = new Date(Date.now() - 1000 * 60 * 60) * 1000;
// Store the page info for each uri
let gPages = [];
function addPageBook(aURI, aTitle, aBook, aTags, aKey)
{
// Add a page entry for the current uri
gPages[aURI] = [aURI, aTitle, aTags];
let uri = iosvc.newURI(kURIs[aURI], null, null);
let title = kTitles[aTitle];
let out = [aURI, aTitle, aBook, aTags, aKey];
out.push("\nuri=" + kURIs[aURI]);
out.push("\ntitle=" + title);
// Add the page and a visit for good measure
bhist.addPageWithDetails(uri, title, gDate);
// Add a bookmark if we need to
if (aBook != undefined) {
let book = kTitles[aBook];
let bmid = bmsvc.insertBookmark(bmsvc.unfiledBookmarksFolder, uri,
bmsvc.DEFAULT_INDEX, book);
out.push("\nbook=" + book);
// Add a keyword to the bookmark if we need to
if (aKey != undefined)
bmsvc.setKeywordForBookmark(bmid, aKey);
// Add tags if we need to
if (aTags != undefined && aTags.length > 0) {
// Convert each tag index into the title
let tags = aTags.map(function(aTag) kTitles[aTag]);
tagsvc.tagURI(uri, tags);
out.push("\ntags=" + tags);
}
}
print("\nAdding page/book/tag: " + out.join(", "));
}
function run_test() {
print("\n");
// Search is asynchronous, so don't let the test finish immediately
do_test_pending();
// Load the test and print a description then run the test
let [description, search, expected, func] = gTests[current_test];
print(description);
// Do an extra function if necessary
if (func)
func();
ensure_results(search, expected);
}
// *************************************************
// *** vvv Custom Test Stuff Goes Below Here vvv ***
// *************************************************
// Define some shared uris and titles (each page needs its own uri)
let kURIs = [
"http://page1",
"http://page2",
"http://page3",
"http://page4",
];
let kTitles = [
"tag1",
"tag2",
"tag3",
];
// Add pages with varying number of tags
addPageBook(0, 0, 0, [0]);
addPageBook(1, 0, 0, [0,1]);
addPageBook(2, 0, 0, [0,2]);
addPageBook(3, 0, 0, [0,1,2]);
// For each test, provide a title, the search terms, and an array of uri
// indices of the pages that should be returned, followed by an optional
// function. The uris can be in any order, but must be an index created by
// addPageBook or placed manually into gPages.
let gTests = [
["0: Make sure tags come back in the title when matching tags",
"page1 tag", [0]],
["1: Check tags in title for page2",
"page2 tag", [1]],
["2: Make sure tags appear even when not matching the tag",
"page3", [2]],
["3: Multiple tags come in commas for page4",
"page4", [3]],
["4: Extra test just to make sure we match the title",
"tag2", [1,3]],
];

38
mozilla/toolkit/components/places/tests/unit/test_word_boundary_search.js
View File

@@ -93,7 +93,7 @@ function ensure_results(aSearch, aExpected)
print("Looking for an expected result of " + value + ", " + comment + "...");
let j;
for (j = 0; j < aExpected.length; j++) {
let [uri, title, tags] = aExpected[j];
let [uri, title, tags] = gPages[aExpected[j]];
// Skip processed expected results
if (uri == undefined) continue;
@@ -108,7 +108,7 @@ function ensure_results(aSearch, aExpected)
if (uri == value && title == comment) {
print("Got it at index " + j + "!!");
// Make it undefined so we don't process it again
aExpected[j] = [,];
aExpected[j] = [];
break;
}
}
@@ -154,9 +154,14 @@ try {
// Some date not too long ago
let gDate = new Date(Date.now() - 1000 * 60 * 60) * 1000;
// Store the page info for each uri
let gPages = [];
function addPageBook(aURI, aTitle, aBook, aTags, aKey)
{
// Add a page entry for the current uri
gPages[aURI] = [aURI, aTitle, aTags];
let uri = iosvc.newURI(kURIs[aURI], null, null);
let title = kTitles[aTitle];
@@ -253,36 +258,37 @@ addPageBook(8, 5);
// CamelCase
addPageBook(9, 0);
// For each test, provide a title, the search terms, and an array of
// [uri,title] indices of the pages that should be returned, followed by an
// optional function
// For each test, provide a title, the search terms, and an array of uri
// indices of the pages that should be returned, followed by an optional
// function. The uris can be in any order, but must be an index created by
// addPageBook or placed manually into gPages.
let gTests = [
["0: Match 'match' at the beginning or after / or on a CamelCase",
"match", [[0,0],[2,1],[4,0],[9,0]]],
"match", [0,2,4,9]],
["1: Match 'dont' at the beginning or after /",
"dont", [[1,0],[3,2],[5,0]]],
"dont", [1,3,5]],
["2: Match '2' after the slash and after a word (in tags too)",
"2", [[2,1],[3,2],[4,0],[5,0]]],
"2", [2,3,4,5]],
["3: Match 't' at the beginning or after /",
"t", [[0,0],[1,0],[2,1],[3,2],[4,0],[5,0],[9,0]]],
"t", [0,1,2,3,4,5,9]],
["4: Match 'word' after many consecutive word boundaries",
"word", [[6,3]]],
"word", [6]],
["5: Match a word boundary '/' for everything",
"/", [[0,0],[1,0],[2,1],[3,2],[4,0],[5,0],[6,3],[7,4],[8,5],[9,0]]],
"/", [0,1,2,3,4,5,6,7,8,9]],
["6: Match word boundaries '()_+' that are among word boundaries",
"()_+", [[6,3]]],
"()_+", [6]],
["7: Katakana characters form a string, so match the beginning",
katakana[0], [[7,4]]],
katakana[0], [7]],
/*["8: Middle of a katakana word shouldn't be matched",
katakana[1], []],*/
["9: Ideographs are treated as words so 'nin' is one word",
ideograph[0], [[8,5]]],
ideograph[0], [8]],
["10: Ideographs are treated as words so 'ten' is another word",
ideograph[1], [[8,5]]],
ideograph[1], [8]],
["11: Ideographs are treated as words so 'do' is yet another",
ideograph[2], [[8,5]]],
ideograph[2], [8]],
["12: Extra negative assert that we don't match in the middle",
"ch", []],

31
mozilla/toolkit/content/widgets/autocomplete.xml
View File

@@ -1146,6 +1146,10 @@
<xul:hbox anonid="title-box" class="ac-title" flex="1"
onunderflow="_doUnderflow('_title');">
<xul:description anonid="title" class="ac-normal-text ac-comment" xbl:inherits="selected"/>
<xul:hbox anonid="extra-box" class="ac-extra" align="center" hidden="true">
<xul:image class="ac-result-type-tag"/>
<xul:description anonid="extra" class="ac-normal-text ac-comment" xbl:inherits="selected"/>
</xul:hbox>
</xul:hbox>
<xul:label anonid="title-overflow-ellipsis" xbl:inherits="selected"
class="ac-ellipsis-after ac-comment" hidden="true"/>
@@ -1189,6 +1193,9 @@
this._titleBox = document.getAnonymousElementByAttribute(this, "anonid", "title-box");
this._title = document.getAnonymousElementByAttribute(this, "anonid", "title");
this._extraBox = document.getAnonymousElementByAttribute(this, "anonid", "extra-box");
this._extra = document.getAnonymousElementByAttribute(this, "anonid", "extra");
this._adjustAcItem();
]]>
</constructor>
@@ -1370,6 +1377,30 @@
var title = this.getAttribute("title");
var type = this.getAttribute("type");
// If we have a tag match, show the tags and icon
if (type == "tag") {
// Configure the extra box for tags display
this._extraBox.hidden = false;
this._extraBox.flex = 1;
this._extraBox.pack = "end";
// The title is separated from the tags by an endash
let tags;
[, title, tags] = title.match(/^(.+) \u2013 (.+)$/);
// Each tag is split by a comma in an undefined order, so sort it
let sortedTags = tags.split(",").sort().join(", ");
// Emphasize the matching text in the tags
this._setUpDescription(this._extra, sortedTags);
// Treat tagged matches as bookmarks for the star
type = "bookmark";
} else {
// Hide the title's extra box if we don't need extra stuff
this._extraBox.hidden = true;
}
// Give the image the icon style and a special one for the type
this._typeImage.className = "ac-type-icon" +
(type ? " ac-result-type-" + type : "");

8
mozilla/toolkit/themes/gnomestripe/global/autocomplete.css
View File

@@ -163,6 +163,14 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
height: 16px;
}
.ac-extra > .ac-result-type-tag {
margin: 0 4px;
}
.ac-extra > .ac-comment {
padding-right: 4px;
}
.ac-ellipsis-after {
margin: 2px 0px 0px 0px !important;
padding: 0;

8
mozilla/toolkit/themes/pinstripe/global/autocomplete.css
View File

@@ -150,6 +150,14 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
height: 16px;
}
.ac-extra > .ac-result-type-tag {
margin: 0 4px;
}
.ac-extra > .ac-comment {
padding-right: 4px;
}
.ac-ellipsis-after {
margin: 2px 0px 0px 0px !important;
padding: 0;

8
mozilla/toolkit/themes/winstripe/global/autocomplete.css
View File

@@ -151,6 +151,14 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
height: 16px;
}
.ac-extra > .ac-result-type-tag {
margin: 0 4px;
}
.ac-extra > .ac-comment {
padding-right: 4px;
}
.ac-ellipsis-after {
margin: 2px 0px 0px 0px !important;
padding: 0;