mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Setup: Only display one QR code at a time

Browse source
This commit is contained in:
Ken Powers 2020-03-24 16:27:12 -04:00 • committed by Scott Nonnenberg
parent 2852b0b92c
commit cbc670e855
2 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/views/install_view.js
View file

@ -144,6 +144,7 @@
return; return;
} }
this.clearQR();
this.$('#qr .container').hide(); this.$('#qr .container').hide();
this.qr = new QRCode(this.$('#qr')[0]).makeCode(url); this.qr = new QRCode(this.$('#qr')[0]).makeCode(url);
this.$('#qr').removeAttr('title'); this.$('#qr').removeAttr('title');

32
ts/util/lint/exceptions.json
View file

@ -597,72 +597,72 @@
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/install_view.js", "path": "js/views/install_view.js",
"line": " this.$('#qr .container').hide();", "line": " this.$('#qr .container').hide();",
"lineNumber": 147, "lineNumber": 148,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2018-09-19T21:59:32.770Z", "updated": "2020-03-24T19:03:04.861Z",
"reasonDetail": "Protected from arbitrary input" "reasonDetail": "Protected from arbitrary input"
}, },
{ {
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/install_view.js", "path": "js/views/install_view.js",
"line": " this.qr = new QRCode(this.$('#qr')[0]).makeCode(url);", "line": " this.qr = new QRCode(this.$('#qr')[0]).makeCode(url);",
"lineNumber": 148, "lineNumber": 149,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2018-09-19T21:59:32.770Z", "updated": "2020-03-24T19:03:04.861Z",
"reasonDetail": "Protected from arbitrary input" "reasonDetail": "Protected from arbitrary input"
}, },
{ {
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/install_view.js", "path": "js/views/install_view.js",
"line": " this.$('#qr').addClass('ready');", "line": " this.$('#qr').addClass('ready');",
"lineNumber": 150, "lineNumber": 151,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2018-09-19T21:59:32.770Z", "updated": "2020-03-24T19:03:04.861Z",
"reasonDetail": "Protected from arbitrary input" "reasonDetail": "Protected from arbitrary input"
}, },
{ {
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/install_view.js", "path": "js/views/install_view.js",
"line": " this.$(DEVICE_NAME_SELECTOR).val(deviceName || window.getHostName());", "line": " this.$(DEVICE_NAME_SELECTOR).val(deviceName || window.getHostName());",
"lineNumber": 155, "lineNumber": 156,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2018-09-19T21:59:32.770Z", "updated": "2020-03-24T19:03:04.861Z",
"reasonDetail": "Protected from arbitrary input" "reasonDetail": "Protected from arbitrary input"
}, },
{ {
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/install_view.js", "path": "js/views/install_view.js",
"line": " this.$('#link-phone').submit();", "line": " this.$('#link-phone').submit();",
"lineNumber": 160, "lineNumber": 161,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2018-09-19T21:59:32.770Z", "updated": "2020-03-24T19:03:04.861Z",
"reasonDetail": "Protected from arbitrary input" "reasonDetail": "Protected from arbitrary input"
}, },
{ {
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/install_view.js", "path": "js/views/install_view.js",
"line": " this.$('#link-phone').submit(e => {", "line": " this.$('#link-phone').submit(e => {",
"lineNumber": 170, "lineNumber": 171,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2018-09-19T21:59:32.770Z", "updated": "2020-03-24T19:03:04.861Z",
"reasonDetail": "Protected from arbitrary input" "reasonDetail": "Protected from arbitrary input"
}, },
{ {
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/install_view.js", "path": "js/views/install_view.js",
"line": " let name = this.$(DEVICE_NAME_SELECTOR).val();", "line": " let name = this.$(DEVICE_NAME_SELECTOR).val();",
"lineNumber": 174, "lineNumber": 175,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2018-09-19T21:59:32.770Z", "updated": "2020-03-24T19:03:04.861Z",
"reasonDetail": "Protected from arbitrary input" "reasonDetail": "Protected from arbitrary input"
}, },
{ {
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/install_view.js", "path": "js/views/install_view.js",
"line": " this.$(DEVICE_NAME_SELECTOR).focus();", "line": " this.$(DEVICE_NAME_SELECTOR).focus();",
"lineNumber": 177, "lineNumber": 178,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2018-09-19T21:59:32.770Z", "updated": "2020-03-24T19:03:04.861Z",
"reasonDetail": "Protected from arbitrary input" "reasonDetail": "Protected from arbitrary input"
}, },
{ {