Issue 2066 - Get rid of non-standard __defineGetter__, __defineSetter__, and __lookupGetter__

lib/prefs.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 27 matching lines @@
 defaults.show_statsinicon = true;
 defaults.show_statsinpopup = true;
 defaults.shouldShowBlockElementMenu = true;
 defaults.hidePlaceholders = true;
 
 let listeners = [];
 
 function defineProperty(key)
 {
   let value = null;
-  Prefs.__defineGetter__(key, function()
-  {
-    if (value === null)
+  Object.defineProperty(Prefs, key, {
+    get: function()
     {
-      if (key in ext.storage)
+      if (value === null)
       {
-        try
+        if (key in ext.storage)
         {
-          value = JSON.parse(ext.storage[key]);
+          try
+          {
+            value = JSON.parse(ext.storage[key]);
+          }
+          catch(e)
+          {
+            Cu.reportError(e);
+          }
         }
-        catch(e)
-        {
-          Cu.reportError(e);
-        }
+
+        if (value === null)
+          value = JSON.parse(JSON.stringify(defaults[key]));
       }
+      return value;
+    },
+    set: function(newValue)
+    {
+      if (typeof newValue != typeof defaults[key])
+        throw new Error("Attempt to change preference type");
 
-      if (value === null)
-        value = JSON.parse(JSON.stringify(defaults[key]));
-    }
-    return value;
-  });
-  Prefs.__defineSetter__(key, function(newValue)
-  {
-    if (typeof newValue != typeof defaults[key])
-      throw new Error("Attempt to change preference type");
+      let stringified = JSON.stringify(newValue);
+      if (stringified != JSON.stringify(defaults[key]))
+        ext.storage[key] = stringified;
+      else
+        delete ext.storage[key];
 
-    let stringified = JSON.stringify(newValue);
-    if (stringified != JSON.stringify(defaults[key]))
-      ext.storage[key] = stringified;
-    else
-      delete ext.storage[key];
+      value = newValue;
 
-    value = newValue;
+      for (let listener of listeners)
+        listener(key);
 
-    for (let listener of listeners)
-      listener(key);
-
-    return value;
+      return value;
+    },
+    enumerable: true
   });
 }
 
 
 let Prefs = exports.Prefs = {
   addListener: function(listener)
   {
     if (listeners.indexOf(listener) < 0)
       listeners.push(listener);
   },
 
   removeListener: function(listener)
   {
     let index = listeners.indexOf(listener);
     if (index >= 0)
       listeners.splice(index, 1);
   },
 };
 
 for (let key in defaults)
   defineProperty(key);