Unified Diff: lib/popupBlocker.js
Issue 29713631:
Issue 5760 - Use relative require paths (Closed)
Patch Set: Address PS1 Comments, rebase
Created March 20, 2018, 11:25 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« lib/filterComposer.js ('K')
|
« lib/options.js ('k')
|
lib/prefs.js » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/popupBlocker.js |
| =================================================================== |
| --- a/lib/popupBlocker.js |
| +++ b/lib/popupBlocker.js |
| @@ -14,21 +14,22 @@ |
| * 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 popupBlocker */ |
| "use strict"; |
| -const {defaultMatcher} = require("matcher"); |
| -const {BlockingFilter, RegExpFilter} = require("filterClasses"); |
| -const {stringifyURL, isThirdParty, extractHostFromFrame} = require("url"); |
| -const {checkWhitelisted} = require("whitelisting"); |
| -const {logRequest} = require("devtools"); |
| +const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); |
| +const {BlockingFilter, |
| + RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); |
| +const {stringifyURL, isThirdParty, extractHostFromFrame} = require("./url"); |
| +const {checkWhitelisted} = require("./whitelisting"); |
| +const {logRequest} = require("./devtools"); |
| let loadingPopups = new Map(); |
| function forgetPopup(tabId) |
| { |
| loadingPopups.delete(tabId); |
| if (loadingPopups.size == 0) |
« lib/filterComposer.js ('K')
|
« lib/options.js ('k')
|
lib/prefs.js » ('j')
|
no next file with comments »
