Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: lib/filterComposer.js

Issue 29713631: Issue 5760 - Use relative require paths (Closed)
Patch Set: Address PS3 comment Created April 3, 2018, 6:03 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: lib/filterComposer.js
===================================================================
--- a/lib/filterComposer.js
+++ b/lib/filterComposer.js
@@ -14,24 +14,24 @@
* 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 filterComposer */
"use strict";
-const {defaultMatcher} = require("matcher");
-const {RegExpFilter} = require("filterClasses");
-const {FilterNotifier} = require("filterNotifier");
-const {Prefs} = require("prefs");
-const {extractHostFromFrame, stringifyURL, isThirdParty} = require("url");
-const {getKey, checkWhitelisted} = require("whitelisting");
-const {port} = require("messaging");
-const info = require("info");
+const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
+const {RegExpFilter} = require("../adblockpluscore/lib/filterClasses");
+const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier");
+const {Prefs} = require("./prefs");
+const {extractHostFromFrame, stringifyURL, isThirdParty} = require("./url");
+const {getKey, checkWhitelisted} = require("./whitelisting");
+const {port} = require("./messaging");
+const info = require("../buildtools/info");
let readyPages = new ext.PageMap();
/**
* Checks whether the given page is ready to use the filter composer
*
* @param {Page} page
* @return {boolean}
@@ -282,17 +282,17 @@
type: "composer.content.dialogClosed",
popupId: popupPageId
});
browser.tabs.onRemoved.removeListener(onRemoved);
}
};
browser.tabs.onRemoved.addListener(onRemoved);
- if (require("info").application == "firefox" &&
+ if (info.application == "firefox" &&
kzar 2018/04/05 11:14:56 Nit: Wouldn't this condition fit on one line now?
Jon Sonesen 2018/04/05 23:01:20 Acknowledged.
navigator.oscpu.startsWith("Linux"))
{
// Work around https://bugzil.la/1408446
browser.windows.update(window.id, {width: window.width + 1});
}
return popupPageId;
});
});

Powered by Google App Engine
This is Rietveld