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

Backed out changeset 5ac1dfd37ebf (bug 61491) due to xpcshell crashes. 

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2013-10-26 23:19:28 -04:00
Родитель 56d14e2fbe
Коммит ba289a6f43
31 изменённых файлов: 53 добавлений и 431 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
mail/components/compose/content/MsgComposeCommands.js
Просмотреть файл

@ -3791,22 +3791,16 @@ function LoadIdentity(startup)
var idKey = identityElement.value;
gCurrentIdentity = MailServices.accounts.getIdentity(idKey);
let accountKey = null;
// Set the account key value on the menu list.
if (identityElement.selectedItem) {
accountKey = identityElement.selectedItem.getAttribute("accountkey");
let accountKey = identityElement.selectedItem.getAttribute("accountkey");
identityElement.setAttribute("accountkey", accountKey);
hideIrrelevantAddressingOptions(accountKey);
}
let maxRecipients = awGetMaxRecipients();
for (let i = 1; i <= maxRecipients; i++)
{
let params = JSON.parse(awGetInputElement(i).searchParam);
params.idKey = idKey;
params.accountKey = accountKey;
awGetInputElement(i).searchParam = JSON.stringify(params);
}
awGetInputElement(i).setAttribute("autocompletesearchparam", idKey);
if (!startup && prevIdentity && idKey != prevIdentity.key)
{
@ -3914,6 +3908,10 @@ function LoadIdentity(startup)
function setupAutocomplete()
{
var autoCompleteWidget = document.getElementById("addressCol2#1");
// When autocompleteToMyDomain is off there is no default entry with the domain
// appended so reduce the minimum results for a popup to 2 in this case.
if (!gCurrentIdentity.autocompleteToMyDomain)
autoCompleteWidget.minResultsForPopup = 2;
// if the pref is set to turn on the comment column, honor it here.
// this element then gets cloned for subsequent rows, so they should

6
mail/components/compose/content/addressingWidgetOverlay.js
Просмотреть файл

@ -774,9 +774,9 @@ function DropRecipient(target, recipient)
function _awSetAutoComplete(selectElem, inputElem)
{
let params = JSON.parse(inputElem.getAttribute('autocompletesearchparam'));
params.type = selectElem.value;
inputElem.setAttribute('autocompletesearchparam', JSON.stringify(params));
inputElem.disableAutoComplete = selectElem.value == 'addr_newsgroups' ||
selectElem.value == 'addr_followup' ||
selectElem.value == 'addr_other';
}
function awSetAutoComplete(rowNumber)

5
mail/components/compose/content/messengercompose.xul
Просмотреть файл

@ -855,11 +855,10 @@
<textbox id="addressCol2#1" class="plain textbox-addressingWidget uri-element"
aria-labelledby="addressCol1#1"
type="autocomplete" flex="1"
autocompletesearch="mydomain addrbook ldap news"
autocompletesearchparam="{}"
autocompletesearch="mydomain addrbook ldap"
timeout="300" maxrows="4"
completedefaultindex="true" forcecomplete="true"
minresultsforpopup="2" ignoreblurwhilesearching="true"
minresultsforpopup="3" ignoreblurwhilesearching="true"
ontextentered="awRecipientTextCommand(eventParam, this)"
onerrorcommand="awRecipientErrorCommand(eventParam, this)"
onchange="onRecipientsInput();"

2
mail/installer/package-manifest.in
Просмотреть файл

@ -200,8 +200,6 @@
@BINPATH@/components/nsBox.js
@BINPATH@/components/nsAddrbook.manifest
@BINPATH@/components/nsMailNewsCommandLineHandler.js
@BINPATH@/components/nsNewsAutoCompleteSearch.js
@BINPATH@/components/nsNewsAutoCompleteSearch.manifest
@BINPATH@/components/services-crypto-component.xpt
#ifndef XP_OS2
@BINPATH@/components/shellservice.xpt

7
mail/themes/linux/mail/compose/messengercompose.css
Просмотреть файл

@ -286,13 +286,6 @@ treechildren::-moz-tree-image(remote-err) {
list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
}
treechildren::-moz-tree-image(subscribed-news) {
-moz-margin-start: 3px;
-moz-margin-end: 2px;
list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-moz-image-region: rect(208px 16px 224px 0px);
}
/* ::::: addressing widget ::::: */
.autocomplete-treebody::-moz-tree-cell-text(comment) {

9
mail/themes/osx/mail/compose/messengercompose.css
Просмотреть файл

@ -527,15 +527,6 @@ treechildren::-moz-tree-image(remote-err) {
}
}
treechildren::-moz-tree-image(subscribed-news) {
margin-top: 2px;
margin-bottom: 2px;
-moz-margin-start: 2px;
-moz-margin-end: -3px;
list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-moz-image-region: rect(0 160px 16px 144px);
}
/* ::::: addressing widget ::::: */
#addressingWidget {

7
mail/themes/windows/mail/compose/messengercompose-aero.css
Просмотреть файл

@ -436,13 +436,6 @@ treechildren::-moz-tree-image(remote-err) {
list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
}
treechildren::-moz-tree-image(subscribed-news) {
-moz-margin-start: 2px;
-moz-margin-end: 5px;
list-style-image: url("chrome://messenger/skin/icons/folder.png");
-moz-image-region: rect(0 160px 16px 144px);
}
/* ::::: addressing widget ::::: */
.autocomplete-treebody::-moz-tree-cell-text(comment) {

7
mail/themes/windows/mail/compose/messengercompose.css
Просмотреть файл

@ -375,13 +375,6 @@ treechildren::-moz-tree-image(remote-err) {
list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png");
}
treechildren::-moz-tree-image(subscribed-news) {
-moz-margin-start: 2px;
-moz-margin-end: 3px;
list-style-image: url("chrome://messenger/skin/icons/folder.png");
-moz-image-region: rect(0 160px 16px 144px);
}
/* ::::: addressing widget ::::: */
.autocomplete-treebody::-moz-tree-cell-text(comment) {

16
mailnews/addrbook/src/nsAbAutoCompleteMyDomain.js
Просмотреть файл

@ -12,20 +12,16 @@ nsAbAutoCompleteMyDomain.prototype = {
QueryInterface: XPCOMUtils.generateQI([
Components.interfaces.nsIAutoCompleteSearch]),
cachedIdKey: "",
cachedParam: "",
cachedIdentity: null,
applicableHeaders: Set(["addr_to", "addr_cc", "addr_bcc", "addr_reply"]),
startSearch: function(aString, aSearchParam, aResult, aListener) {
let params = JSON.parse(aSearchParam);
let applicable = this.applicableHeaders.has(params.type);
startSearch: function(aString, aParam, aResult, aListener) {
const ACR = Components.interfaces.nsIAutoCompleteResult;
var address = null;
if (applicable && aString && !aString.contains(",")) {
if (params.idKey != this.cachedIdKey) {
this.cachedIdentity = MailServices.accounts.getIdentity(params.idKey);
this.cachedIdKey = params.idKey;
if (aString && !aString.contains(",")) {
if (aParam != this.cachedParam) {
this.cachedIdentity = MailServices.accounts.getIdentity(aParam);
this.cachedParam = aParam;
}
if (this.cachedIdentity.autocompleteToMyDomain)
address = aString.contains("@") ? aString :

9
mailnews/addrbook/src/nsAbAutoCompleteSearch.js
Просмотреть файл

@ -80,7 +80,6 @@ nsAbAutoCompleteSearch.prototype = {
_commentColumn: 0,
_parser: MailServices.headerParser,
_abManager: MailServices.ab,
applicableHeaders: Set(["addr_to", "addr_cc", "addr_bcc", "addr_reply"]),
// Private methods
@ -346,13 +345,7 @@ nsAbAutoCompleteSearch.prototype = {
*/
startSearch: function startSearch(aSearchString, aSearchParam,
aPreviousResult, aListener) {
let params = JSON.parse(aSearchParam);
var result = new nsAbAutoCompleteResult(aSearchString);
if (!this.applicableHeaders.has(params.type)) {
result.searchResult = ACR.RESULT_IGNORED;
aListener.onSearchResult(this, result);
return;
}
// If the search string isn't value, or contains a comma, or the user
// hasn't enabled autocomplete, then just return no matches / or the
@ -436,7 +429,7 @@ nsAbAutoCompleteSearch.prototype = {
var dir = allABs.getNext();
if (dir instanceof Components.interfaces.nsIAbDirectory &&
dir.useForAutocomplete(params.idKey)) {
dir.useForAutocomplete(aSearchParam)) {
this._searchCards(searchQuery, dir, result);
this._searchWithinEmails(emailSearchQuery, fullString, dir, result);
}

12
mailnews/addrbook/src/nsAbLDAPAutoCompleteSearch.js
Просмотреть файл

@ -99,8 +99,6 @@ nsAbLDAPAutoCompleteSearch.prototype = {
_parser: MailServices.headerParser,
applicableHeaders: Set(["addr_to", "addr_cc", "addr_bcc", "addr_reply"]),
// Private methods
_checkDuplicate: function _checkDuplicate(card, emailAddress) {
@ -161,10 +159,6 @@ nsAbLDAPAutoCompleteSearch.prototype = {
startSearch: function startSearch(aSearchString, aParam,
aPreviousResult, aListener) {
let params = JSON.parse(aParam);
let applicable = this.applicableHeaders.has(params.type);
let idKey = params.idKey;
this._result = new nsAbLDAPAutoCompleteResult(aSearchString);
aSearchString = aSearchString.toLocaleLowerCase();
@ -173,7 +167,7 @@ nsAbLDAPAutoCompleteSearch.prototype = {
// result ignored.
// The comma check is so that we don't autocomplete against the user
// entering multiple addresses.
if (!applicable || !aSearchString || aSearchString.contains(",")) {
if (!aSearchString || aSearchString.contains(",")) {
this._result.searchResult = ACR.RESULT_IGNORED;
aListener.onSearchResult(this, this._result);
return;
@ -184,9 +178,9 @@ nsAbLDAPAutoCompleteSearch.prototype = {
var acDirURI = null;
var identity;
if (idKey) {
if (aParam) {
try {
identity = MailServices.accounts.getIdentity(idKey);
identity = MailServices.accounts.getIdentity(aParam);
}
catch(ex) {
Components.utils.reportError("Couldn't get specified identity, falling " +

28
mailnews/addrbook/test/unit/test_nsAbAutoCompleteMyDomain.js
Просмотреть файл

@ -24,8 +24,6 @@ function run_test() {
.getService(Components.interfaces.nsIAutoCompleteSearch);
var obs = new acObserver();
let obsNews = new acObserver();
let obsFollowup = new acObserver();
// Set up an identity in the account manager with the default settings
let identity = MailServices.accounts.createIdentity();
@ -34,13 +32,8 @@ function run_test() {
identity.autocompleteToMyDomain = false;
identity.email = "myemail@foo.invalid";
// Set up autocomplete parameters
let params = JSON.stringify({ idKey: identity.key, type: "addr_to" });
let paramsNews = JSON.stringify({ idKey: identity.key, type: "addr_newsgroups" });
let paramsFollowup = JSON.stringify({ idKey: identity.key, type: "addr_followup" });
// Test - Valid search - this should return no results (autocomplete disabled)
acs.startSearch("test", params, null, obs);
acs.startSearch("test", identity.key, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, "test");
@ -53,7 +46,7 @@ function run_test() {
// Test - Search with empty string
acs.startSearch(null, params, null, obs);
acs.startSearch(null, identity.key, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, null);
@ -61,7 +54,7 @@ function run_test() {
do_check_eq(obs._result.errorDescription, null);
do_check_eq(obs._result.matchCount, 0);
acs.startSearch("", params, null, obs);
acs.startSearch("", identity.key, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, "");
@ -71,7 +64,7 @@ function run_test() {
// Test - Check ignoring result with comma
acs.startSearch("a,b", params, null, obs);
acs.startSearch("a,b", identity.key, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, "a,b");
@ -81,7 +74,7 @@ function run_test() {
// Test - Check returning search string with @ sign
acs.startSearch("a@b", params, null, obs);
acs.startSearch("a@b", identity.key, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, "a@b");
@ -95,18 +88,9 @@ function run_test() {
do_check_eq(obs._result.getStyleAt(0), "default-match");
do_check_eq(obs._result.getImageAt(0), null);
// No autocomplete for addr_newsgroups!
acs.startSearch("a@b", paramsNews, null, obsNews);
do_check_true(obsNews._result == null || obsNews._result.matchCount == 0);
// No autocomplete for addr_followup!
acs.startSearch("a@b", paramsFollowup, null, obsFollowup);
do_check_true(obsFollowup._result == null || obsFollowup._result.matchCount == 0);
// Test - Add default domain
acs.startSearch("test1", params, null, obs);
acs.startSearch("test1", identity.key, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, "test1");

30
mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch1.js
Просмотреть файл

@ -106,18 +106,12 @@ function run_test() {
.getService(Components.interfaces.nsIAutoCompleteSearch);
var obs = new acObserver();
let obsNews = new acObserver();
let obsFollowup = new acObserver();
// Test - Check disabling of autocomplete
Services.prefs.setBoolPref("mail.enable_autocomplete", false);
let param = JSON.stringify({ type: "addr_to" });
let paramNews = JSON.stringify({ type: "addr_newsgroups" });
let paramFollowup = JSON.stringify({ type: "addr_followup" });
acs.startSearch("abc", param, null, obs);
acs.startSearch("abc", null, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, "abc");
@ -129,7 +123,7 @@ function run_test() {
Services.prefs.setBoolPref("mail.enable_autocomplete", true);
acs.startSearch(null, param, null, obs);
acs.startSearch(null, null, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, null);
@ -140,7 +134,7 @@ function run_test() {
// Test - Check ignoring result with comma
acs.startSearch("a,b", param, null, obs);
acs.startSearch("a,b", null, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, "a,b");
@ -151,7 +145,7 @@ function run_test() {
// Test - No matches
acs.startSearch("asjdkljdgfjglkfg", param, null, obs);
acs.startSearch("asjdkljdgfjglkfg", null, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, "asjdkljdgfjglkfg");
@ -163,7 +157,7 @@ function run_test() {
// Test - Matches
// Basic quick-check
acs.startSearch("email", param, null, obs);
acs.startSearch("email", null, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, "email");
@ -178,18 +172,10 @@ function run_test() {
do_check_eq(obs._result.getStyleAt(0), "local-abook");
do_check_eq(obs._result.getImageAt(0), "");
// quick-check that nothing is found for addr_newsgroups
acs.startSearch("email", paramNews, null, obsNews);
do_check_true(obsNews._result == null || obsNews._result.matchCount == 0);
// quick-check that nothing is found for addr_followup
acs.startSearch("a@b", paramFollowup, null, obsFollowup);
do_check_true(obsFollowup._result == null || obsFollowup._result.matchCount == 0);
// Now quick-check with the address book name in the comment column.
Services.prefs.setIntPref("mail.autoComplete.commentColumn", 1);
acs.startSearch("email", param, null, obs);
acs.startSearch("email", null, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, "email");
@ -205,7 +191,7 @@ function run_test() {
do_check_eq(obs._result.getImageAt(0), "");
// Check input with different case
acs.startSearch("EMAIL", param, null, obs);
acs.startSearch("EMAIL", null, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, "EMAIL");
@ -224,7 +210,7 @@ function run_test() {
// Now check multiple matches
function checkInputItem(element, index, array) {
print("Checking " + element.search);
acs.startSearch(element.search, param, null, obs);
acs.startSearch(element.search, null, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, element.search);

2
mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch2.js
Просмотреть файл

@ -171,7 +171,7 @@ function run_test() {
// Now check multiple matches
function checkInputItem(element, index, array) {
acs.startSearch(element.search, JSON.stringify({ type: "addr_to" }), lastResult, obs);
acs.startSearch(element.search, null, lastResult, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, element.search);

2
mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch3.js
Просмотреть файл

@ -73,7 +73,7 @@ function run_test()
function checkInputItem(element, index, array) {
print("Checking " + element.search);
acs.startSearch(element.search, JSON.stringify({ type: "addr_to" }), null, obs);
acs.startSearch(element.search, null, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, element.search);

4
mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch4.js
Просмотреть файл

@ -128,7 +128,7 @@ function run_test()
function checkSearch(element, index, array) {
print("Checking " + element);
acs.startSearch(element, JSON.stringify({ type: "addr_to" }), null, obs);
acs.startSearch(element, null, null, obs)
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, element);
@ -153,7 +153,7 @@ function run_test()
var lastResult = null;
function checkReductionSearch(element, index, array) {
acs.startSearch(element, JSON.stringify({ type: "addr_to" }), lastResult, obs);
acs.startSearch(element, null, lastResult, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, element);

2
mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch5.js
Просмотреть файл

@ -64,7 +64,7 @@ function run_test() {
// Now check multiple matches
function checkInputItem(element, index, array) {
print("Checking " + element.search);
acs.startSearch(element.search, JSON.stringify({ type: "addr_to" }), null, obs);
acs.startSearch(element.search, null, null, obs);
do_check_eq(obs._search, acs);
do_check_eq(obs._result.searchString, element.search);

5
mailnews/news/src/moz.build
Просмотреть файл

@ -20,11 +20,6 @@ SOURCES += [
'nsNntpUrl.cpp',
]
EXTRA_COMPONENTS += [
'nsNewsAutoCompleteSearch.js',
'nsNewsAutoCompleteSearch.manifest',
]
if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
FORCE_STATIC_LIB = True
else:

137
mailnews/news/src/nsNewsAutoCompleteSearch.js
Просмотреть файл

@ -1,137 +0,0 @@
/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const Cc = Components.classes;
const Ci = Components.interfaces;
const Cu = Components.utils;
Cu.import("resource:///modules/mailServices.js");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
const kACR = Ci.nsIAutoCompleteResult;
const kSupportedTypes = Set(["addr_newsgroups", "addr_followup"]);
function nsNewsAutoCompleteResult(aSearchString) {
// Can't create this in the prototype as we'd get the same array for
// all instances
this._searchResults = [];
this.searchString = aSearchString;
}
nsNewsAutoCompleteResult.prototype = {
_searchResults: null,
// nsIAutoCompleteResult
searchString: null,
searchResult: kACR.RESULT_NOMATCH,
defaultIndex: -1,
errorDescription: null,
get matchCount() {
return this._searchResults.length;
},
getValueAt: function getValueAt(aIndex) {
return this._searchResults[aIndex].value;
},
getLabelAt: function getLabelAt(aIndex) {
return this._searchResults[aIndex].value;
},
getCommentAt: function getCommentAt(aIndex) {
return this._searchResults[aIndex].comment;
},
getStyleAt: function getStyleAt(aIndex) {
return "subscribed-news";
},
getImageAt: function getImageAt(aIndex) {
return "";
},
removeValueAt: function removeValueAt(aRowIndex, aRemoveFromDB) {
},
// nsISupports
QueryInterface: XPCOMUtils.generateQI([kACR])
}
function nsNewsAutoCompleteSearch() {}
nsNewsAutoCompleteSearch.prototype = {
// For component registration
classDescription: "Newsgroup Autocomplete",
classID: Components.ID("e9bb3330-ac7e-11de-8a39-0800200c9a66"),
cachedAccountKey: "",
cachedServer: null,
/**
* Find the newsgroup server associated with the given accountKey.
*
* @param accountKey The key of the account.
* @return The incoming news server (or null if one does not exist).
*/
_findServer: function _findServer(accountKey) {
let account = MailServices.accounts.getAccount(accountKey);
if (account.incomingServer.type == 'nntp')
return account.incomingServer;
else
return null;
},
// nsIAutoCompleteSearch
startSearch: function startSearch(aSearchString, aSearchParam,
aPreviousResult, aListener) {
let params = JSON.parse(aSearchParam);
let result = new nsNewsAutoCompleteResult(aSearchString);
if (!params.type || !params.accountKey ||
!kSupportedTypes.has(params.type)) {
result.searchResult = kACR.RESULT_IGNORED;
aListener.onSearchResult(this, result);
return;
}
if (params.accountKey != this.cachedAccountKey) {
this.cachedAccountKey = params.accountKey;
this.cachedServer = this._findServer(params.accountKey);
}
if (this.cachedServer) {
let groups = this.cachedServer.rootFolder.subFolders;
while (groups.hasMoreElements()) {
let curr = groups.getNext().QueryInterface(Ci.nsIMsgFolder);
if (curr.prettiestName.contains(aSearchString)) {
result._searchResults.push({
value: curr.prettiestName,
comment: this.cachedServer.prettyName
});
}
}
}
if (result.matchCount) {
result.searchResult = kACR.RESULT_SUCCESS;
// If the user does not select anything, use the first entry:
result.defaultIndex = 0;
}
aListener.onSearchResult(this, result);
},
stopSearch: function stopSearch() {
},
// nsISupports
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteSearch])
};
// Module
var NSGetFactory = XPCOMUtils.generateNSGetFactory([nsNewsAutoCompleteSearch]);

2
mailnews/news/src/nsNewsAutoCompleteSearch.manifest
Просмотреть файл

@ -1,2 +0,0 @@
component {e9bb3330-ac7e-11de-8a39-0800200c9a66} nsNewsAutoCompleteSearch.js
contract @mozilla.org/autocomplete/search;1?name=news {e9bb3330-ac7e-11de-8a39-0800200c9a66}

7
mailnews/news/test/unit/head_server_setup.js
Просмотреть файл

@ -95,7 +95,6 @@ Services.prefs.setBoolPref("mail.strict_threading", true);
const NNTP_PORT = 1024+119;
var _server = null;
let _account = null;
function subscribeServer(incomingServer) {
// Subscribe to newsgroups
@ -112,13 +111,11 @@ function subscribeServer(incomingServer) {
function setupLocalServer(port) {
if (_server != null)
return _server;
let serverAndAccount =
localAccountUtils.create_incoming_server_and_account("nntp", port, null, null);
let server = serverAndAccount.server;
let server = localAccountUtils.create_incoming_server("nntp", port,
null, null);
subscribeServer(server);
_server = server;
_account = serverAndAccount.account;
return server;
}

106
mailnews/news/test/unit/test_newsAutocomplete.js
Просмотреть файл

@ -1,106 +0,0 @@
/* -*- Mode: JavaScript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
*
* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/licenses/publicdomain/
*
* ***** END LICENSE BLOCK ***** */
Components.utils.import("resource:///modules/mailServices.js");
// The basic daemon to use for testing nntpd.js implementations
var gDaemon = setupNNTPDaemon();
const ACR = Components.interfaces.nsIAutoCompleteResult;
function acObserver() {}
acObserver.prototype = {
_search: null,
_result: null,
onSearchResult: function (aSearch, aResult) {
this._search = aSearch;
this._result = aResult;
}
};
function run_test() {
let type = "RFC 977";
let localserver = setupLocalServer(NNTP_PORT);
let server = makeServer(NNTP_RFC977_handler, gDaemon);
server.start(NNTP_PORT);
// create identity
let identity = MailServices.accounts.createIdentity();
_account.addIdentity(identity);
let acs = Components.classes["@mozilla.org/autocomplete/search;1?name=news"]
.getService(Components.interfaces.nsIAutoCompleteSearch);
let obs;
let paramsN = JSON.stringify({
idKey: identity.key,
accountKey: _account.key,
type: "addr_newsgroups" });
let paramsF = JSON.stringify({
idKey: identity.key,
accountKey: _account.key,
type: "addr_followup" });
let paramsMail = JSON.stringify({
idKey: identity.key,
accountKey: _account.key,
type: "addr_to" });
// misc.test is not subscribed
obs = new acObserver();
acs.startSearch("misc", paramsN, null, obs);
do_check_true(obs._result == null || obs._result.matchCount == 0);
obs = new acObserver();
acs.startSearch("misc", paramsF, null, obs);
do_check_true(obs._result == null || obs._result.matchCount == 0);
obs = new acObserver();
acs.startSearch("misc", paramsMail, null, obs);
do_check_true(obs._result == null || obs._result.matchCount == 0);
// test.filter is subscribed
obs = new acObserver();
acs.startSearch("filter", paramsN, null, obs);
do_check_eq(obs._result.matchCount, 1);
obs = new acObserver();
acs.startSearch("filter", paramsF, null, obs);
do_check_eq(obs._result.matchCount, 1);
// ... but no auto-complete should occur for addr_to
obs = new acObserver();
acs.startSearch("filter", paramsMail, null, obs);
do_check_true(obs._result == null || obs._result.matchCount == 0);
// test.subscribe.empty and test.subscribe.simple are subscribed
obs = new acObserver();
acs.startSearch("subscribe", paramsN, null, obs);
do_check_eq(obs._result.matchCount, 2);
obs = new acObserver();
acs.startSearch("subscribe", paramsF, null, obs);
do_check_eq(obs._result.matchCount, 2);
// ... but no auto-complete should occur for addr_to
obs = new acObserver();
acs.startSearch("subscribe", paramsMail, null, obs);
do_check_true(obs._result == null || obs._result.matchCount == 0);
// test.subscribe.empty is subscribed, test.empty is not
obs = new acObserver();
acs.startSearch("empty", paramsN, null, obs);
do_check_eq(obs._result.matchCount, 1);
obs = new acObserver();
acs.startSearch("empty", paramsF, null, obs);
do_check_eq(obs._result.matchCount, 1);
server.stop();
};

1
mailnews/news/test/unit/xpcshell.ini
Просмотреть файл

@ -15,7 +15,6 @@ support-files = postings/*
[test_nntpContentLength.js]
# The server doesn't support returning sizes! (bug 782629)
skip-if = true
[test_newsAutocomplete.js]
[test_nntpGroupPassword.js]
[test_nntpPassword.js]
[test_nntpPassword2.js]

19
mailnews/test/resources/localAccountUtils.js
Просмотреть файл

@ -59,23 +59,6 @@ var localAccountUtils = {
* @return The newly-created nsIMsgIncomingServer.
*/
create_incoming_server: function(aType, aPort, aUsername, aPassword) {
let serverAndAccount = localAccountUtils.
create_incoming_server_and_account(aType, aPort, aUsername, aPassword);
return serverAndAccount.server;
},
/**
* Create an nsIMsgIncomingServer and an nsIMsgAccount to go with it.
*
* @param aType The type of the server (pop3, imap etc).
* @param aPort The port the server is on.
* @param aUsername The username for the server.
* @param aPassword The password for the server.
* @return An object with the newly-created nsIMsgIncomingServer as the
"server" property and the newly-created nsIMsgAccount as the
"account" property.
*/
create_incoming_server_and_account: function (aType, aPort, aUsername, aPassword) {
let server = MailServices.accounts.createIncomingServer(aUsername, "localhost",
aType);
server.port = aPort;
@ -97,7 +80,7 @@ var localAccountUtils = {
}
server.valid = true;
return {server: server, account: account};
return server;
},
/**

2
suite/installer/package-manifest.in
Просмотреть файл

@ -758,8 +758,6 @@ bin/libfreebl_32int64_3.so
@BINPATH@/components/nsMailNewsCommandLineHandler.js
@BINPATH@/components/nsMsgTraitService.js
@BINPATH@/components/nsMsgTraitService.manifest
@BINPATH@/components/nsNewsAutoCompleteSearch.js
@BINPATH@/components/nsNewsAutoCompleteSearch.manifest
@BINPATH@/components/nsSMTPProtocolHandler.js
@BINPATH@/components/nsSMTPProtocolHandler.manifest
@BINPATH@/components/offlineStartup.js

15
suite/mailnews/compose/MsgComposeCommands.js
Просмотреть файл

@ -2461,18 +2461,9 @@ function LoadIdentity(startup)
var idKey = identityElement.value;
gCurrentIdentity = gAccountManager.getIdentity(idKey);
let accountKey = null;
if (identityElement.selectedItem)
accountKey = identityElement.selectedItem.getAttribute("accountkey");
let maxRecipients = awGetMaxRecipients();
for (let i = 1; i <= maxRecipients; i++)
{
let params = JSON.parse(awGetInputElement(i).searchParam);
params.idKey = idKey;
params.accountKey = accountKey;
awGetInputElement(i).searchParam = JSON.stringify(params);
}
awGetInputElement(i).setAttribute("autocompletesearchparam", idKey);
if (!startup && prevIdentity && idKey != prevIdentity.key)
{
@ -2581,6 +2572,10 @@ function LoadIdentity(startup)
function setupAutocomplete()
{
var autoCompleteWidget = document.getElementById("addressCol2#1");
// When autocompleteToMyDomain is off, there is no default entry with the domain
// appended, so reduce the minimum results for a popup to 2 in this case.
if (!gCurrentIdentity.autocompleteToMyDomain)
autoCompleteWidget.minResultsForPopup = 2;
// if the pref is set to turn on the comment column, honor it here.
// this element then gets cloned for subsequent rows, so they should

6
suite/mailnews/compose/addressingWidgetOverlay.js
Просмотреть файл

@ -721,9 +721,9 @@ function DropRecipient(recipient)
function _awSetAutoComplete(selectElem, inputElem)
{
let params = JSON.parse(inputElem.getAttribute('autocompletesearchparam'));
params.type = selectElem.value;
inputElem.setAttribute('autocompletesearchparam', JSON.stringify(params));
inputElem.disableAutoComplete = selectElem.value == 'addr_newsgroups' ||
selectElem.value == 'addr_followup' ||
selectElem.value == 'addr_other';
}
function awSetAutoComplete(rowNumber)

5
suite/mailnews/compose/addressingWidgetOverlay.xul
Просмотреть файл

@ -46,10 +46,9 @@
aria-labelledby="addressCol1#1"
type="autocomplete" flex="1" maxrows="4"
newlines="replacewithcommas"
autocompletesearch="mydomain addrbook ldap news" timeout="300"
autocompletesearchparam="{}"
autocompletesearch="mydomain addrbook ldap" timeout="300"
completedefaultindex="true" forcecomplete="true"
minresultsforpopup="2" ignoreblurwhilesearching="true"
minresultsforpopup="3" ignoreblurwhilesearching="true"
ontextentered="awRecipientTextCommand(eventParam, this)"
onerrorcommand="awRecipientErrorCommand(eventParam, this)"
oninput="gContentChanged=true; setupAutocomplete();" disableonsend="true"

6
suite/themes/classic/mac/messenger/messengercompose/messengercompose.css
Просмотреть файл

@ -215,12 +215,6 @@ treechildren::-moz-tree-image(remote-err) {
list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.gif");
}
treechildren::-moz-tree-image(subscribed-news) {
-moz-margin-start: 2px;
-moz-margin-end: -3px;
list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
}
/* ::::: lightweight themes ::::: */
#MsgHeadersToolbar:-moz-lwtheme,

6
suite/themes/classic/messenger/messengercompose/messengercompose.css
Просмотреть файл

@ -256,12 +256,6 @@ treechildren::-moz-tree-image(remote-err) {
list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.gif");
}
treechildren::-moz-tree-image(subscribed-news) {
-moz-margin-start: 2px;
-moz-margin-end: -3px;
list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
}
/* ::::: lightweight themes ::::: */
#MsgHeadersToolbar:-moz-lwtheme,

5
suite/themes/modern/messenger/messengercompose/messengercompose.css
Просмотреть файл

@ -200,8 +200,3 @@ treechildren::-moz-tree-image(remote-err) {
list-style-image: url("chrome://messenger/skin/addressbook/icons/directory-down.gif");
}
treechildren::-moz-tree-image(subscribed-news) {
-moz-margin-start: 3px;
-moz-margin-end: -4px;
list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.gif");
}