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

Unified Diff: composer.postload.js

Issue 29374674: Issue 4864 - Start using ESLint for adblockpluschrome (Closed)
Patch Set: Remove extra space Created March 23, 2017, 10:30 a.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: composer.postload.js
diff --git a/composer.postload.js b/composer.postload.js
index bab0ea4c63f17d8dda8243403d5c14832107de5f..e45eed440fbbbea70d746d9635e680894f922109 100644
--- a/composer.postload.js
+++ b/composer.postload.js
@@ -15,6 +15,8 @@
* along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
*/
+/* globals checkCollapse, elemhide, getURLsFromElement, typeMap */
+
"use strict";
// The page ID for the popup filter selection dialog (top frame only).
@@ -43,8 +45,7 @@ let lastRightClickEventIsMostRecent = false;
function getFiltersForElement(element, callback)
{
let src = element.getAttribute("src");
- ext.backgroundPage.sendMessage(
- {
+ ext.backgroundPage.sendMessage({
type: "composer.getFilters",
tagName: element.localName,
id: element.id,
@@ -52,7 +53,7 @@ function getFiltersForElement(element, callback)
style: element.getAttribute("style"),
classes: Array.prototype.slice.call(element.classList),
urls: getURLsFromElement(element),
- mediatype: typeMap[element.localName],
+ mediatype: typeMap.get(element.localName),
baseURL: document.location.href
},
response =>
@@ -388,21 +389,15 @@ function elementPicked(event)
if (currentlyPickingElement)
stopPickingElement();
- ext.backgroundPage.sendMessage(
- {
+ ext.backgroundPage.sendMessage({
type: "composer.openDialog"
},
popupId =>
{
- ext.backgroundPage.sendMessage(
- {
+ ext.backgroundPage.sendMessage({
type: "forward",
targetPageId: popupId,
- payload:
- {
- type: "composer.dialog.init",
- filters: filters
- }
+ payload: {type: "composer.dialog.init", filters}
});
// Only the top frame keeps a record of the popup window's ID,
@@ -413,14 +408,9 @@ function elementPicked(event)
}
else
{
- ext.backgroundPage.sendMessage(
- {
+ ext.backgroundPage.sendMessage({
type: "forward",
- payload:
- {
- type: "composer.content.dialogOpened",
- popupId: popupId
- }
+ payload: {type: "composer.content.dialogOpened", popupId}
});
}
});
@@ -461,8 +451,7 @@ function deactivateBlockElement()
if (blockelementPopupId != null)
{
- ext.backgroundPage.sendMessage(
- {
+ ext.backgroundPage.sendMessage({
type: "forward",
targetPageId: blockelementPopupId,
payload:
@@ -504,8 +493,7 @@ if (document instanceof HTMLDocument)
lastRightClickEvent = event;
lastRightClickEventIsMostRecent = true;
- ext.backgroundPage.sendMessage(
- {
+ ext.backgroundPage.sendMessage({
type: "forward",
payload:
{
@@ -520,9 +508,11 @@ if (document instanceof HTMLDocument)
{
case "composer.content.getState":
if (window == window.top)
+ {
Sebastian Noack 2017/03/29 17:14:12 Apparently we turned the "curly" rule off in the e
kzar 2017/03/30 07:20:43 I've removed most of those unrelated curly changes
sendResponse({
active: currentlyPickingElement || blockelementPopupId != null
});
+ }
break;
case "composer.content.startPickingElement":
if (window == window.top)
@@ -572,8 +562,7 @@ if (document instanceof HTMLDocument)
// to be careful here. (This is not perfect, but best we can do.)
if (window == window.top && blockelementPopupId == msg.popupId)
{
- ext.backgroundPage.sendMessage(
- {
+ ext.backgroundPage.sendMessage({
type: "forward",
payload:
{

Powered by Google App Engine
This is Rietveld