summaryrefslogtreecommitdiff
path: root/common/modules/options.jsm
diff options
context:
space:
mode:
authorKris Maglione <maglione.k@gmail.com>2011-03-07 18:10:55 -0500
committerKris Maglione <maglione.k@gmail.com>2011-03-07 18:10:55 -0500
commit7e2e11f09b14c9c5e0e3f29c13ab5d23079d115e (patch)
treeb85d82fb3bcd8c76103d36f01430c42cbc1ecd10 /common/modules/options.jsm
parentd336764b4738af533420f942c946643ec61fc165 (diff)
downloadpentadactyl-7e2e11f09b14c9c5e0e3f29c13ab5d23079d115e.tar.gz
Don't do automagic localization for option values provided by getters.
Diffstat (limited to 'common/modules/options.jsm')
-rw-r--r--common/modules/options.jsm5
1 files changed, 3 insertions, 2 deletions
diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index 31684cba..1c61a40a 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -69,9 +69,10 @@ var Option = Class("Option", {
this._op = Option.ops[this.type];
// Need to trigger setter
- if (extraInfo && "values" in extraInfo)
+ if (extraInfo && "values" in extraInfo && !extraInfo.__lookupGetter__("values")) {
this.values = extraInfo.values;
- delete extraInfo.values;
+ delete extraInfo.values;
+ }
if (extraInfo)
update(this, extraInfo);