Issue 2437 - Update adblockplus dependency to revision 752ffe2eeaf1

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 34 matching lines @@
 };
 
 let values = Object.create(defaults);
 let path = _fileSystem.resolve("prefs.json");
 let listeners = [];
 let isDirty = false;
 let isSaving = false;
 
 function defineProperty(key)
 {
-  Prefs.__defineGetter__(key, function() values[key]);
-  Prefs.__defineSetter__(key, function(value)
+  Object.defineProperty(Prefs, key,
   {
-    if (typeof value != typeof defaults[key])
-      throw new Error("Attempt to change preference type");
+    get: () => values[key],
+    set: function(value)
+    {
+      if (typeof value != typeof defaults[key])
+        throw new Error("Attempt to change preference type");
 
-    if (value == defaults[key])
-      delete values[key];
-    else
-      values[key] = value;
-    save();
+      if (value == defaults[key])
+        delete values[key];
+      else
+        values[key] = value;
+      save();
 
-    for (let listener of listeners)
-      listener(key);
+      for (let listener of listeners)
+        listener(key);
+    }

[Wladimir Palant, 2015/04/30 08:30:24]

enumerable: true please, otherwise debugging will be no fun.

[Felix Dahlke, 2015/04/30 13:17:38]

Done.

   });
 }
 
 function load()
 {
   _fileSystem.read(path, function(result)
   {
     // prefs.json is expected to be missing, ignore errors reading file
     if (!result.error)
     {
@@ skipping 45 matching lines @@
     let index = listeners.indexOf(listener);
     if (index >= 0)
       listeners.splice(index, 1);
   },
 };
 
 for (let key in defaults)
   defineProperty(key);
 
 load();