1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-01 19:35:46 +01:00

merge refactored loadPreference()

This commit is contained in:
Doug Kearns
2007-09-25 19:28:55 +00:00
parent b8ac03c9e8
commit 3c87cd0257

View File

@@ -143,16 +143,15 @@ function Options() //{{{
function loadPreference(name, forced_default, vimperator_branch) function loadPreference(name, forced_default, vimperator_branch)
{ {
var pref = null; var default_value = null;
var default_value = ""; if (forced_default != null) // this argument sets defaults for non-user settable options (like comp_history)
default_value = forced_default;
if (vimperator_branch) if (vimperator_branch)
{ {
branch = vimperator_prefs; branch = vimperator_prefs;
if (forced_default) // this argument sets defaults for non-user settable options (like comp_history) if (!forced_default) // this argument sets defaults for non-user settable options (like comp_history)
default_value = forced_default;
else
{ {
for (var i = 0; i < options.length; i++) for (var i = 0; i < options.length; i++)
{ {
@@ -171,21 +170,22 @@ function Options() //{{{
try try
{ {
if (typeof default_value == "string") switch (typeof default_value)
pref = branch.getCharPref(name); {
else if (typeof default_value == "number") case "string":
pref = branch.getIntPref(name); return branch.getCharPref(name);
else if (typeof default_value == "boolean") case "number":
pref = branch.getBoolPref(name); return branch.getIntPref(name);
else case "boolean":
pref = default_value; return branch.getBoolPref(name);
default:
return default_value;
}
} }
catch (e) catch (e)
{ {
//alert("error: " + e); return default_value;
pref = default_value;
} }
return pref;
} }
function setGuiOptions(value) function setGuiOptions(value)