From a450cdf52813ea25be31fed7777725ae347e1788 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Mon, 8 Apr 2019 11:30:19 -0700
Subject: [PATCH] Lint fixes for recent PRs

---
 libtextsecure/sendmessage.js |  5 +----
 package.json                 |  3 ++-
 stylesheets/_variables.scss  |  9 +++++++--
 ts/util/lint/exceptions.json | 20 ++++++++++----------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js
index 2eae8a660..fd1e7f913 100644
--- a/libtextsecure/sendmessage.js
+++ b/libtextsecure/sendmessage.js
@@ -1085,10 +1085,7 @@ MessageSender.prototype = {
 
 window.textsecure = window.textsecure || {};
 
-textsecure.MessageSender = function MessageSenderWrapper(
-  username,
-  password,
-) {
+textsecure.MessageSender = function MessageSenderWrapper(username, password) {
   const sender = new MessageSender(username, password);
 
   this.sendExpirationTimerUpdateToNumber = sender.sendExpirationTimerUpdateToNumber.bind(
diff --git a/package.json b/package.json
index c9c1092bb..57874d786 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,8 @@
     "transpile": "tsc",
     "clean-transpile": "rimraf ts/**/*.js && rimraf ts/*.js",
     "open-coverage": "open coverage/lcov-report/index.html",
-    "styleguide": "styleguidist server"
+    "styleguide": "styleguidist server",
+    "ready": "yarn clean-transpile && yarn grunt && yarn lint && yarn test-node && yarn test-electron && yarn lint-deps"
   },
   "dependencies": {
     "@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#2e28733b61640556b0272a3bfc78b0357daf71e6",
diff --git a/stylesheets/_variables.scss b/stylesheets/_variables.scss
index 19070b4f8..e7c13bf25 100644
--- a/stylesheets/_variables.scss
+++ b/stylesheets/_variables.scss
@@ -22,8 +22,13 @@
   font-weight: bold;
 }
 
-$roboto: Roboto, 'Helvetica Neue', 'Source Sans Pro', 'Source Han Sans SC', 'Source Han Sans CN', 'Hiragino Sans GB', 'Hiragino Kaku Gothic', 'Microsoft Yahei UI', Helvetica, Arial, sans-serif;
-$roboto-light: Roboto-Light, 'Helvetica Neue', 'Source Sans Pro Light', 'Source Han Sans SC Light', 'Source Han Sans CN Light', 'Hiragino Sans GB Light', 'Hiragino Kaku Gothic Light', 'Microsoft Yahei UI Light',  Helvetica, Arial, sans-serif;
+$roboto: Roboto, 'Helvetica Neue', 'Source Sans Pro', 'Source Han Sans SC',
+  'Source Han Sans CN', 'Hiragino Sans GB', 'Hiragino Kaku Gothic',
+  'Microsoft Yahei UI', Helvetica, Arial, sans-serif;
+$roboto-light: Roboto-Light, 'Helvetica Neue', 'Source Sans Pro Light',
+  'Source Han Sans SC Light', 'Source Han Sans CN Light',
+  'Hiragino Sans GB Light', 'Hiragino Kaku Gothic Light',
+  'Microsoft Yahei UI Light', Helvetica, Arial, sans-serif;
 
 // New colors
 
diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json
index 2edda105d..5b4f954fa 100644
--- a/ts/util/lint/exceptions.json
+++ b/ts/util/lint/exceptions.json
@@ -1057,17 +1057,17 @@
   {
     "rule": "jQuery-$(",
     "path": "js/views/settings_view.js",
-    "line": "        el: this.$('.menu-bar-setting'),",
-    "lineNumber": 110,
+    "line": "          el: this.$('.menu-bar-setting'),",
+    "lineNumber": 111,
     "reasonCategory": "usageTrusted",
-    "updated": "2018-09-19T21:59:32.770Z",
+    "updated": "2019-04-08T18:24:35.255Z",
     "reasonDetail": "Protected from arbitrary input"
   },
   {
     "rule": "jQuery-$(",
     "path": "js/views/settings_view.js",
     "line": "        el: this.$('.media-permissions'),",
-    "lineNumber": 116,
+    "lineNumber": 118,
     "reasonCategory": "usageTrusted",
     "updated": "2018-09-19T21:59:32.770Z",
     "reasonDetail": "Protected from arbitrary input"
@@ -1076,7 +1076,7 @@
     "rule": "jQuery-$(",
     "path": "js/views/settings_view.js",
     "line": "        this.$('.sync-setting').append(syncView.el);",
-    "lineNumber": 122,
+    "lineNumber": 124,
     "reasonCategory": "usageTrusted",
     "updated": "2018-09-19T21:59:32.770Z",
     "reasonDetail": "Protected from arbitrary input"
@@ -1085,7 +1085,7 @@
     "rule": "jQuery-append(",
     "path": "js/views/settings_view.js",
     "line": "        this.$('.sync-setting').append(syncView.el);",
-    "lineNumber": 122,
+    "lineNumber": 124,
     "reasonCategory": "usageTrusted",
     "updated": "2018-09-19T18:13:29.628Z",
     "reasonDetail": "Interacting with already-existing DOM nodes"
@@ -1094,7 +1094,7 @@
     "rule": "jQuery-$(",
     "path": "js/views/settings_view.js",
     "line": "      this.$('.sync').text(i18n('syncNow'));",
-    "lineNumber": 176,
+    "lineNumber": 179,
     "reasonCategory": "usageTrusted",
     "updated": "2018-09-19T21:59:32.770Z",
     "reasonDetail": "Protected from arbitrary input"
@@ -1103,7 +1103,7 @@
     "rule": "jQuery-$(",
     "path": "js/views/settings_view.js",
     "line": "      this.$('.sync').attr('disabled', 'disabled');",
-    "lineNumber": 180,
+    "lineNumber": 183,
     "reasonCategory": "usageTrusted",
     "updated": "2018-09-19T21:59:32.770Z",
     "reasonDetail": "Protected from arbitrary input"
@@ -1112,7 +1112,7 @@
     "rule": "jQuery-$(",
     "path": "js/views/settings_view.js",
     "line": "      this.$('.synced_at').hide();",
-    "lineNumber": 192,
+    "lineNumber": 195,
     "reasonCategory": "usageTrusted",
     "updated": "2018-09-19T21:59:32.770Z",
     "reasonDetail": "Protected from arbitrary input"
@@ -1121,7 +1121,7 @@
     "rule": "jQuery-$(",
     "path": "js/views/settings_view.js",
     "line": "      this.$('.sync_failed').hide();",
-    "lineNumber": 197,
+    "lineNumber": 200,
     "reasonCategory": "usageTrusted",
     "updated": "2018-09-19T21:59:32.770Z",
     "reasonDetail": "Protected from arbitrary input"