From 5a50786e7a7a518627eca72034ecedea3945d41b Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Wed, 10 Apr 2019 12:14:32 -0700
Subject: [PATCH] Lint fixes

---
 preload.js                   | 13 ++++++-------
 ts/util/lint/exceptions.json | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/preload.js b/preload.js
index 71ff13141..2efbcc3d3 100644
--- a/preload.js
+++ b/preload.js
@@ -288,13 +288,12 @@ const contextMenu = require('electron-context-menu');
 
 contextMenu({
   showInspectElement: false,
-  shouldShowMenu: (event, params) => {
-    if(!params.isEditable && params.mediaType === 'none' && ( params.linkURL.length !== 0 || params.selectionText.length !== 0 )) {
-      return params.linkURL || params.selectionText;
-    }
-
-    return false;
-  },
+  shouldShowMenu: (event, params) =>
+    Boolean(
+      !params.isEditable &&
+        params.mediaType === 'none' &&
+        (params.linkURL || params.selectionText)
+    ),
 });
 
 // We pull this in last, because the native module involved appears to be sensitive to
diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json
index 5b4f954fa..4e95ac637 100644
--- a/ts/util/lint/exceptions.json
+++ b/ts/util/lint/exceptions.json
@@ -2878,6 +2878,22 @@
     "reasonCategory": "falseMatch",
     "updated": "2018-09-19T18:13:29.628Z"
   },
+  {
+    "rule": "jQuery-prepend(",
+    "path": "node_modules/electron-context-menu/index.js",
+    "line": "\t\t\tconst result = options.prepend(props, win);",
+    "lineNumber": 122,
+    "reasonCategory": "falseMatch",
+    "updated": "2019-04-10T19:08:25.356Z"
+  },
+  {
+    "rule": "jQuery-append(",
+    "path": "node_modules/electron-context-menu/index.js",
+    "line": "\t\t\tconst result = options.append(props, win);",
+    "lineNumber": 130,
+    "reasonCategory": "falseMatch",
+    "updated": "2019-04-10T19:08:25.356Z"
+  },
   {
     "rule": "eval",
     "path": "node_modules/electron/electron.d.ts",