Unified Diff: lib/utils.js
Issue 29374674:
Issue 4864 - Start using ESLint for adblockpluschrome (Closed)
Patch Set: Update adblockplusui dependency to include the notification fix
Created March 19, 2017, 6:48 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« lib/url.js ('k')
|
lib/whitelisting.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/utils.js |
| diff --git a/lib/utils.js b/lib/utils.js |
| index 9361039f8137f85bb5fe4f7fbf43590531c9a657..177abf56235829fad7f91cb56908b64379697816 100644 |
| --- a/lib/utils.js |
| +++ b/lib/utils.js |
| @@ -37,9 +37,7 @@ let Utils = exports.Utils = { |
| document.addEventListener("DOMContentLoaded", onDOMContentLoaded); |
| } |
| else |
| - { |
| setTimeout(callback, 0); |
| - } |
| }, |
| get appLocale() |
| { |
| @@ -58,8 +56,10 @@ let Utils = exports.Utils = { |
| return null; |
| for (let prefix of prefixes.split(",")) |
| + { |
| if (new RegExp("^" + prefix + "\\b").test(this.appLocale)) |
| return prefix; |
| + } |
| return null; |
| }, |
| @@ -74,7 +74,9 @@ let Utils = exports.Utils = { |
| if (!selectedItem) |
| selectedItem = subscription; |
| - let prefix = Utils.checkLocalePrefixMatch(subscription.getAttribute("prefixes")); |
| + let prefix = Utils.checkLocalePrefixMatch( |
| + subscription.getAttribute("prefixes") |
| + ); |
| if (prefix) |
| { |
| if (!selectedPrefix || selectedPrefix.length < prefix.length) |
| @@ -105,7 +107,8 @@ let Utils = exports.Utils = { |
| getDocLink(linkID) |
| { |
| let docLink = require("prefs").Prefs.documentation_link; |
| - return docLink.replace(/%LINK%/g, linkID).replace(/%LANG%/g, Utils.appLocale); |
| + return docLink.replace(/%LINK%/g, linkID) |
| + .replace(/%LANG%/g, Utils.appLocale); |
| }, |
| yield() |
« no previous file with comments
|
« lib/url.js ('k')
|
lib/whitelisting.js » ('j')
|
no next file with comments »
