зеркало из https://github.com/mozilla/gecko-dev.git
bug 41245, Cancel does not work in Accept languge preference, r=nhotta, sr=alecf, a=blizzard
This commit is contained in:
Родитель
6aa0f8d504
Коммит
502c5389af
|
@ -86,13 +86,7 @@ function Init()
|
|||
//pref service backup
|
||||
} //catch
|
||||
|
||||
try {
|
||||
pref_string = parent.hPrefWindow.getPref( "string", "intl.accept_languages");
|
||||
} //try
|
||||
|
||||
catch(ex) {
|
||||
} //catch
|
||||
|
||||
pref_string = active_languages.getAttribute("prefvalue");
|
||||
LoadActiveLanguages();
|
||||
|
||||
} else {
|
||||
|
@ -507,40 +501,9 @@ function UpdateSavePrefString()
|
|||
} //if
|
||||
}//for
|
||||
|
||||
parent.hPrefWindow.setPref( "string", "intl.accept_languages", pref_string );
|
||||
//Save();
|
||||
|
||||
active_languages.setAttribute("prefvalue", pref_string);
|
||||
}
|
||||
|
||||
function Save()
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
var prefInt = null;
|
||||
|
||||
if (!prefInt) {
|
||||
|
||||
prefInt = Components.classes["@mozilla.org/preferences;1"];
|
||||
|
||||
if (prefInt) {
|
||||
prefInt = prefInt.getService();
|
||||
prefInt = prefInt.QueryInterface(Components.interfaces.nsIPref);
|
||||
}
|
||||
}
|
||||
|
||||
if (prefInt)
|
||||
{
|
||||
prefInt.SetCharPref("intl.accept_languages", pref_string);
|
||||
}
|
||||
}
|
||||
|
||||
catch(ex)
|
||||
{
|
||||
}
|
||||
|
||||
} //Save
|
||||
|
||||
|
||||
function MoveUp() {
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["intlAcceptLanguages", "DefaultCharsetList"];
|
||||
var _elementIDs = ["active_languages", "DefaultCharsetList"];
|
||||
]]>
|
||||
</script>
|
||||
|
||||
|
@ -57,6 +57,7 @@
|
|||
<html>&languages.customize.active.label;</html>
|
||||
<box flex="1">
|
||||
<tree class="inset" id="active_languages" flex="1" style="width: 0px; height: 0px;"
|
||||
pref="true" preftype="string" prefstring="intl.accept_languages" prefvalue="" prefattribute="prefvalue" wsm_attributes="prefvalue"
|
||||
datasources="rdf:null" multiple="true" onselect="SelectLanguage();">
|
||||
<treecolgroup>
|
||||
<treecol flex="1"/>
|
||||
|
|
Загрузка…
Ссылка в новой задаче