| Index: lib/requestBlocker.js |
| =================================================================== |
| --- a/lib/requestBlocker.js |
| +++ b/lib/requestBlocker.js |
| @@ -14,25 +14,26 @@ |
| * 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 requestBlocker */ |
| "use strict"; |
| -const {Filter, RegExpFilter, BlockingFilter} = require("filterClasses"); |
| -const {Subscription} = require("subscriptionClasses"); |
| -const {defaultMatcher} = require("matcher"); |
| -const {FilterNotifier} = require("filterNotifier"); |
| -const {Prefs} = require("prefs"); |
| -const {checkWhitelisted, getKey} = require("whitelisting"); |
| -const {stringifyURL, extractHostFromFrame, isThirdParty} = require("url"); |
| -const {port} = require("messaging"); |
| -const devtools = require("devtools"); |
| +const {Filter, RegExpFilter, BlockingFilter} = |
| + require("../adblockpluscore/lib/filterClasses"); |
| +const {Subscription} = require("../adblockpluscore/lib/subscriptionClasses"); |
| +const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); |
| +const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier"); |
| +const {Prefs} = require("./prefs"); |
| +const {checkWhitelisted, getKey} = require("./whitelisting"); |
| +const {stringifyURL, extractHostFromFrame, isThirdParty} = require("./url"); |
| +const {port} = require("./messaging"); |
| +const devtools = require("./devtools"); |
| // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests. |
| if (!browser.webRequest.ResourceType || |
| !("OBJECT_SUBREQUEST" in browser.webRequest.ResourceType)) |
| { |
| RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT; |
| } |