зеркало из https://github.com/mozilla/pjs.git
Bug 228501 Fix mailWidgets to tokenize search headers in the same way as the C++, also fixing a JavsScript strict warning r=bienvenu sr=mscott
This commit is contained in:
Родитель
f47f31c191
Коммит
355f8689f0
|
@ -979,29 +979,21 @@
|
|||
var strings = new Array;
|
||||
var ids = this.valueIds;
|
||||
var pref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
|
||||
var hdrs;
|
||||
var hdrsArray = null;
|
||||
try
|
||||
{
|
||||
hdrs = pref.getCharPref("mailnews.customHeaders");
|
||||
var hdrs = pref.getCharPref("mailnews.customHeaders");
|
||||
hdrs = hdrs.replace(/\s+/g,''); //remove white spaces before splitting
|
||||
hdrsArray = hdrs.match(/[^:]+/g);
|
||||
}
|
||||
catch(ex)
|
||||
{
|
||||
hdrs=null;
|
||||
}
|
||||
var hdrsArray = new Array;
|
||||
if (hdrs)
|
||||
{
|
||||
hdrs = hdrs.replace(/\s+/g,''); //remove white spaces before splitting
|
||||
hdrsArray = hdrs.split(":");
|
||||
for (var i = 0; i< hdrsArray.length; i++)
|
||||
if (!hdrsArray[i])
|
||||
hdrsArray.splice(i,1); //remove any null elements
|
||||
}
|
||||
var bundle = this.stringBundle;
|
||||
var j=0;
|
||||
for (var i=0; i<ids.length; i++)
|
||||
{
|
||||
if(ids[i] > Components.interfaces.nsMsgSearchAttrib.OtherHeader && hdrs)
|
||||
if(ids[i] > Components.interfaces.nsMsgSearchAttrib.OtherHeader && hdrsArray)
|
||||
strings[i] = hdrsArray[j++];
|
||||
else
|
||||
strings[i] = this.stringBundle.GetStringFromID(ids[i]);
|
||||
|
|
Загрузка…
Ссылка в новой задаче