Skip to content

Commit

Permalink
Lint fixes for recent PRs
Browse files Browse the repository at this point in the history
  • Loading branch information
scottnonnenberg-signal committed Apr 8, 2019
1 parent 7727dc0 commit a450cdf
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 17 deletions.
5 changes: 1 addition & 4 deletions libtextsecure/sendmessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 7 additions & 2 deletions stylesheets/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
20 changes: 10 additions & 10 deletions ts/util/lint/exceptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit a450cdf

Please sign in to comment.