From 66c8a0897a1cf8217d8f1a390ff36c55ff9ca91b Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Sun, 22 Aug 2021 12:28:07 +0200
Subject: [PATCH] Enable the ESLint `object-shorthand` rule in the
 `extensions/chromium/`-folder

Based on the following compatibility information, there can't be any compelling reason to not enable this ESLint rule now: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Object_initializer#browser_compatibility

See also https://eslint.org/docs/rules/object-shorthand
---
 extensions/chromium/.eslintrc                | 1 -
 extensions/chromium/options/migration.js     | 2 +-
 extensions/chromium/pageAction/background.js | 2 +-
 extensions/chromium/pdfHandler-vcros.js      | 6 +++---
 extensions/chromium/pdfHandler.js            | 4 ++--
 extensions/chromium/preserve-referer.js      | 4 ++--
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/extensions/chromium/.eslintrc b/extensions/chromium/.eslintrc
index 9b12e47c4..961e86830 100644
--- a/extensions/chromium/.eslintrc
+++ b/extensions/chromium/.eslintrc
@@ -18,6 +18,5 @@
   "rules": {
     "mozilla/import-globals": "error",
     "no-var": "off",
-    "object-shorthand": "off",
   },
 }
diff --git a/extensions/chromium/options/migration.js b/extensions/chromium/options/migration.js
index 25f660714..9d73ef205 100644
--- a/extensions/chromium/options/migration.js
+++ b/extensions/chromium/options/migration.js
@@ -119,7 +119,7 @@ limitations under the License.
             // Overwrite if computed textLayerMode is not the default value (1).
             storageSync.set(
               {
-                textLayerMode: textLayerMode,
+                textLayerMode,
               },
               function () {
                 if (!chrome.runtime.lastError) {
diff --git a/extensions/chromium/pageAction/background.js b/extensions/chromium/pageAction/background.js
index ab9b259db..e19697039 100644
--- a/extensions/chromium/pageAction/background.js
+++ b/extensions/chromium/pageAction/background.js
@@ -28,7 +28,7 @@ limitations under the License.
     if (url) {
       url = url[1];
       chrome.pageAction.setPopup({
-        tabId: tabId,
+        tabId,
         popup: "/pageAction/popup.html?file=" + encodeURIComponent(url),
       });
       chrome.pageAction.show(tabId);
diff --git a/extensions/chromium/pdfHandler-vcros.js b/extensions/chromium/pdfHandler-vcros.js
index 1fe3102d2..e1381d405 100644
--- a/extensions/chromium/pdfHandler-vcros.js
+++ b/extensions/chromium/pdfHandler-vcros.js
@@ -78,9 +78,9 @@ limitations under the License.
     if (windowId) {
       chrome.tabs.create(
         {
-          windowId: windowId,
+          windowId,
           active: true,
-          url: url,
+          url,
         },
         function () {
           openViewer(windowId, fileEntries);
@@ -91,7 +91,7 @@ limitations under the License.
         {
           type: "normal",
           focused: true,
-          url: url,
+          url,
         },
         function (chromeWindow) {
           openViewer(chromeWindow.id, fileEntries);
diff --git a/extensions/chromium/pdfHandler.js b/extensions/chromium/pdfHandler.js
index 22d819e80..d12081b68 100644
--- a/extensions/chromium/pdfHandler.js
+++ b/extensions/chromium/pdfHandler.js
@@ -242,12 +242,12 @@ chrome.runtime.onMessage.addListener(function (message, sender, sendResponse) {
       chrome.tabs.create({
         windowId: sender.tab.windowId,
         index: sender.tab.index + 1,
-        url: url,
+        url,
         openerTabId: sender.tab.id,
       });
     } else {
       chrome.tabs.update(sender.tab.id, {
-        url: url,
+        url,
       });
     }
   }
diff --git a/extensions/chromium/preserve-referer.js b/extensions/chromium/preserve-referer.js
index aff414852..606fd7ef4 100644
--- a/extensions/chromium/preserve-referer.js
+++ b/extensions/chromium/preserve-referer.js
@@ -123,7 +123,7 @@ chrome.runtime.onConnect.addListener(function onReceivePort(port) {
         {
           urls: [data.requestUrl],
           types: ["xmlhttprequest"],
-          tabId: tabId,
+          tabId,
         },
         ["blocking", ...extraInfoSpecWithHeaders]
       );
@@ -148,7 +148,7 @@ chrome.runtime.onConnect.addListener(function onReceivePort(port) {
     {
       urls: ["https://*/*"],
       types: ["xmlhttprequest"],
-      tabId: tabId,
+      tabId,
     },
     ["blocking", "responseHeaders"]
   );