Issue 5760 - Use relative require paths

lib/prefs.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @module prefs */
 
 "use strict";
 
-const {EventEmitter} = require("events");
+const {EventEmitter} = require("../adblockpluscore/lib/events");
 
 const keyPrefix = "pref:";
 
 let eventEmitter = new EventEmitter();
 let overrides = Object.create(null);
 
 /** @lends module:prefs.Prefs */
 let defaults = Object.create(null);
 
 /**
@@ skipping 225 matching lines @@
 {
   return keyPrefix + pref;
 }
 
 function savePref(pref)
 {
   ext.storage.set(prefToKey(pref), overrides[pref]);
 }
 
 let customSave = new Map();
-if (require("info").platform == "gecko")
+if (require("../buildtools/info").platform == "gecko")
 {
   // Saving one storage value causes all others to be saved as well on Gecko.
   // Make sure that updating ad counter doesn't cause the filters data to be
   // saved frequently as a side-effect.
   const MIN_UPDATE_INTERVAL = 60 * 1000;
   let lastUpdate = -MIN_UPDATE_INTERVAL;
   let updateScheduled = false;
   customSave.set("blocked_total", pref =>
   {
     if (updateScheduled)
@@ skipping 54 matching lines @@
     {
       for (let key in items)
         overrides[keyToPref(key)] = items[key];
 
       resolve();
     });
   });
 
   let managedLoaded = new Promise(resolve =>
   {
-    if (require("info").platform == "chromium" && "managed" in browser.storage)
+    if (require("../buildtools/info").platform == "chromium" &&
+      "managed" in browser.storage)

[kzar, 2018/03/19 21:50:08]

Please fix the whitespace here, `"managed"` should be inline with `require`.

[Jon Sonesen, 2018/03/20 23:25:18]

Acknowledged. Since rebase this require is not needed

     {
       browser.storage.managed.get(null, items =>
       {
         // Opera doesn't support browser.storage.managed, but instead simply
         // removing the API, Opera sets browser.runtime.lastError when using it.
         // So we have to retrieve that error, to prevent it from showing up
         // in the console.
         browser.runtime.lastError;
 
         for (let key in items)
@@ skipping 26 matching lines @@
           eventEmitter.emit(pref);
         }
       }
     });
   }
 
   Prefs.untilLoaded = Promise.all([localLoaded, managedLoaded]).then(onLoaded);
 }
 
 init();