Lint fixes

7 years ago · 0850dc368a
parent 7d9711ba65
commit 0850dc368a
4 changed files with 77 additions and 28 deletions
--- a/images/unidentified-delivery.svg
+++ b/images/unidentified-delivery.svg
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
+    <title>Secret Sender/secret-sender-20</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Secret-Sender/secret-sender-20" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M9.5,13.5 L9.5,15 L1,15 C0.44771525,15 -4.05829902e-13,14.5522847 -4.05897538e-13,14 L-4.05897538e-13,6.5 C-4.05965173e-13,5.94771525 0.44771525,5.5 1,5.5 L9.5,5.5 L9.5,9.5 L1.5,9.5 L1.5,11 L9.5,11 L9.5,12 L1.5,12 L1.5,13.5 L9.5,13.5 Z M1.5,7 L1.5,8.5 L7.5,8.5 L7.5,7 L1.5,7 Z M10.5,13.9993439 L10.5,3 C10.5,2.44771525 10.9477153,2 11.5,2 L19,2 C19.5522847,2 20,2.44771525 20,3 L20,5.48610565 L10.5,13.9993439 Z M13,14 L14,14 L14,15 L13,15 L13,14 Z M16,14 L17,14 L17,15 L16,15 L16,14 Z M19,14 L20,14 C20,14.5522847 19.5522847,15 19,15 L19,14 Z M19,11 L20,11 L20,12 L19,12 L19,11 Z M19,8 L20,8 L20,9 L19,9 L19,8 Z" id="Combined-Shape" fill="#000000"></path>
+    </g>
+</svg>
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@ -365,7 +365,7 @@ export class Message extends React.Component<Props, State> {
    );
  }

-  // tslint:disable-next-line max-func-body-length cyclomatic-complexity jsx-no-lambda react-this-binding-issue
+  // tslint:disable-next-line max-func-body-length cyclomatic-complexity
  public renderAttachment() {
    const {
      i18n,
--- a/ts/util/lint/exceptions.json
+++ b/ts/util/lint/exceptions.json
@ -244,7 +244,7 @@
    "rule": "jQuery-wrap(",
    "path": "js/background.js",
    "line": "        const profileKey = dcodeIO.ByteBuffer.wrap(details.profileKey).toString(",
-    "lineNumber": 884,
+    "lineNumber": 883,
    "reasonCategory": "falseMatch",
    "updated": "2018-10-02T21:00:44.007Z"
  },
@ -461,7 +461,7 @@
    "rule": "DOM-innerHTML",
    "path": "js/views/app_view.js",
    "line": "      this.el.innerHTML = '';",
-    "lineNumber": 36,
+    "lineNumber": 43,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-15T00:38:04.183Z",
    "reasonDetail": "Hard-coded string"
@ -470,7 +470,7 @@
    "rule": "jQuery-append(",
    "path": "js/views/app_view.js",
    "line": "      this.el.append(view.el);",
-    "lineNumber": 37,
+    "lineNumber": 44,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Interacting with already-existing DOM nodes"
@ -479,7 +479,7 @@
    "rule": "jQuery-appendTo(",
    "path": "js/views/app_view.js",
    "line": "      this.debugLogView.$el.appendTo(this.el);",
-    "lineNumber": 43,
+    "lineNumber": 50,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Interacting with already-existing DOM nodes"
@ -1006,11 +1006,20 @@
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Interacting with already-existing DOM nodes"
  },
+  {
+    "rule": "jQuery-appendTo(",
+    "path": "js/views/conversation_view.js",
+    "line": "        toast.$el.appendTo(this.$el);",
+    "lineNumber": 1063,
+    "reasonCategory": "usageTrusted",
+    "updated": "2018-10-11T19:22:47.331Z",
+    "reasonDetail": "Operating on already-existing DOM elements"
+  },
  {
    "rule": "jQuery-prepend(",
    "path": "js/views/conversation_view.js",
    "line": "      this.$el.prepend(dialog.el);",
-    "lineNumber": 1084,
+    "lineNumber": 1091,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Interacting with already-existing DOM nodes"
@ -1019,7 +1028,7 @@
    "rule": "jQuery-$(",
    "path": "js/views/conversation_view.js",
    "line": "      view.$el.insertBefore(this.$('.panel').first());",
-    "lineNumber": 1180,
+    "lineNumber": 1187,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T21:59:32.770Z",
    "reasonDetail": "Protected from arbitrary input"
@ -1028,7 +1037,7 @@
    "rule": "jQuery-insertBefore(",
    "path": "js/views/conversation_view.js",
    "line": "      view.$el.insertBefore(this.$('.panel').first());",
-    "lineNumber": 1180,
+    "lineNumber": 1187,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Interacting with already-existing DOM nodes"
@ -1037,7 +1046,7 @@
    "rule": "jQuery-prepend(",
    "path": "js/views/conversation_view.js",
    "line": "      this.$el.prepend(dialog.el);",
-    "lineNumber": 1258,
+    "lineNumber": 1265,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Interacting with already-existing DOM nodes"
@ -1046,7 +1055,7 @@
    "rule": "jQuery-$(",
    "path": "js/views/conversation_view.js",
    "line": "      this.$('.send').prepend(this.quoteView.el);",
-    "lineNumber": 1428,
+    "lineNumber": 1435,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T21:59:32.770Z",
    "reasonDetail": "Protected from arbitrary input"
@ -1055,7 +1064,7 @@
    "rule": "jQuery-prepend(",
    "path": "js/views/conversation_view.js",
    "line": "      this.$('.send').prepend(this.quoteView.el);",
-    "lineNumber": 1428,
+    "lineNumber": 1435,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Interacting with already-existing DOM nodes"
@ -1064,7 +1073,7 @@
    "rule": "jQuery-appendTo(",
    "path": "js/views/conversation_view.js",
    "line": "        toast.$el.appendTo(this.$el);",
-    "lineNumber": 1451,
+    "lineNumber": 1458,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Interacting with already-existing DOM nodes"
@ -1073,7 +1082,7 @@
    "rule": "jQuery-$(",
    "path": "js/views/conversation_view.js",
    "line": "        this.$('.bottom-bar form').submit();",
-    "lineNumber": 1497,
+    "lineNumber": 1504,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T21:59:32.770Z",
    "reasonDetail": "Protected from arbitrary input"
@ -1082,7 +1091,7 @@
    "rule": "jQuery-$(",
    "path": "js/views/conversation_view.js",
    "line": "      const $attachmentPreviews = this.$('.attachment-previews');",
-    "lineNumber": 1506,
+    "lineNumber": 1513,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T21:59:32.770Z",
    "reasonDetail": "Protected from arbitrary input"
@ -1091,7 +1100,7 @@
    "rule": "jQuery-$(",
    "path": "js/views/conversation_view.js",
    "line": "        this.$('.panel').css('display') === 'none'",
-    "lineNumber": 1537,
+    "lineNumber": 1544,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T21:59:32.770Z",
    "reasonDetail": "Protected from arbitrary input"
@ -1172,7 +1181,7 @@
    "rule": "jQuery-$(",
    "path": "js/views/file_input_view.js",
    "line": "      this.$input = this.$('input[type=file]');",
-    "lineNumber": 41,
+    "lineNumber": 45,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T21:59:32.770Z",
    "reasonDetail": "Protected from arbitrary input"
@ -1181,7 +1190,7 @@
    "rule": "jQuery-$(",
    "path": "js/views/file_input_view.js",
    "line": "      this.$('.avatar').hide();",
-    "lineNumber": 84,
+    "lineNumber": 88,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T21:59:32.770Z",
    "reasonDetail": "Protected from arbitrary input"
@ -1190,7 +1199,7 @@
    "rule": "jQuery-$(",
    "path": "js/views/file_input_view.js",
    "line": "      this.$('.attachment-previews').append(this.thumb.render().el);",
-    "lineNumber": 86,
+    "lineNumber": 90,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T21:59:32.770Z",
    "reasonDetail": "Protected from arbitrary input"
@ -1199,7 +1208,7 @@
    "rule": "jQuery-append(",
    "path": "js/views/file_input_view.js",
    "line": "      this.$('.attachment-previews').append(this.thumb.render().el);",
-    "lineNumber": 86,
+    "lineNumber": 90,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Interacting with already-existing DOM nodes"
@ -1208,7 +1217,7 @@
    "rule": "jQuery-$(",
    "path": "js/views/file_input_view.js",
    "line": "      this.thumb.$('img')[0].onload = () => {",
-    "lineNumber": 94,
+    "lineNumber": 98,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T21:59:32.770Z",
    "reasonDetail": "Protected from arbitrary input"
@ -1217,7 +1226,7 @@
    "rule": "jQuery-$(",
    "path": "js/views/file_input_view.js",
    "line": "      this.thumb.$('img')[0].onerror = () => {",
-    "lineNumber": 97,
+    "lineNumber": 101,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T21:59:32.770Z",
    "reasonDetail": "Protected from arbitrary input"
@ -1226,16 +1235,25 @@
    "rule": "jQuery-insertAfter(",
    "path": "js/views/file_input_view.js",
    "line": "      toast.$el.insertAfter(this.$el);",
-    "lineNumber": 104,
+    "lineNumber": 108,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Interacting with already-existing DOM nodes"
  },
+  {
+    "rule": "jQuery-insertAfter(",
+    "path": "js/views/file_input_view.js",
+    "line": "        toast.$el.insertAfter(this.$el);",
+    "lineNumber": 188,
+    "reasonCategory": "usageTrusted",
+    "updated": "2018-10-11T19:22:47.331Z",
+    "reasonDetail": "Operating on already-existing DOM elements"
+  },
  {
    "rule": "jQuery-insertAfter(",
    "path": "js/views/file_input_view.js",
    "line": "          toast.$el.insertAfter(this.$el);",
-    "lineNumber": 264,
+    "lineNumber": 282,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Interacting with already-existing DOM nodes"
@ -1244,7 +1262,7 @@
    "rule": "jQuery-$(",
    "path": "js/views/file_input_view.js",
    "line": "      this.$('.avatar').show();",
-    "lineNumber": 367,
+    "lineNumber": 386,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T21:59:32.770Z",
    "reasonDetail": "Protected from arbitrary input"
@ -1253,7 +1271,7 @@
    "rule": "jQuery-wrap(",
    "path": "js/views/file_input_view.js",
    "line": "        .wrap('<form>')",
-    "lineNumber": 377,
+    "lineNumber": 396,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Hard-coded value"
@ -1859,15 +1877,33 @@
    "updated": "2018-09-19T18:13:29.628Z",
    "reasonDetail": "Interacting with already-existing DOM nodes"
  },
+  {
+    "rule": "jQuery-$(",
+    "path": "js/views/recorder_view.js",
+    "line": "      $(window).on('blur', this.onSwitchAwayBound);",
+    "lineNumber": 19,
+    "reasonCategory": "usageTrusted",
+    "updated": "2018-10-11T19:22:47.331Z",
+    "reasonDetail": "Operating on already-existing DOM elements"
+  },
  {
    "rule": "jQuery-$(",
    "path": "js/views/recorder_view.js",
    "line": "      this.$('.time').text(`${minutes}:${seconds}`);",
-    "lineNumber": 31,
+    "lineNumber": 38,
    "reasonCategory": "usageTrusted",
    "updated": "2018-09-19T21:59:32.770Z",
    "reasonDetail": "Protected from arbitrary input"
  },
+  {
+    "rule": "jQuery-$(",
+    "path": "js/views/recorder_view.js",
+    "line": "      $(window).off('blur', this.onSwitchAwayBound);",
+    "lineNumber": 69,
+    "reasonCategory": "usageTrusted",
+    "updated": "2018-10-11T19:22:47.331Z",
+    "reasonDetail": "Operating on already-existing DOM elements"
+  },
  {
    "rule": "jQuery-$(",
    "path": "js/views/settings_view.js",
--- a/tslint.json
+++ b/tslint.json
@ -18,10 +18,14 @@
    // CSS-in-JS solution:
    "jsx-no-multiline-js": false,

+    // We'll make tradeoffs where appropriate
+    "jsx-no-lambda": false,
+    "react-this-binding-issue": false,
+
    "linebreak-style": [true, "LF"],

-    // Ignore `import`s to allow Prettier formatting:
-    "max-line-length": [true, { "limit": 90, "ignore-pattern": "^import" }],
+    // Prettier handles this for us
+    "max-line-length": false,

    "mocha-avoid-only": true,
    // Disabled until we can allow dynamically generated tests: