PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'develop' into travis/soft-logout-copy

Browse source
This commit is contained in:
Travis Ralston 2019-07-11 14:47:13 -06:00
commit 5958cf0693
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/dialogs/BugReportDialog.js
View file

@ -50,6 +50,13 @@ export default class BugReportDialog extends React.Component {
} }
_onSubmit(ev) { _onSubmit(ev) {
if ((!this.state.text || !this.state.text.trim()) && (!this.state.issueUrl || !this.state.issueUrl.trim())) {
this.setState({
err: _t("Please tell us what went wrong or, better, a github issue that describes the problem."),
});
return;
}
const userText = const userText =
(this.state.text.length > 0 ? this.state.text + '\n\n': '') + 'Issue: ' + (this.state.text.length > 0 ? this.state.text + '\n\n': '') + 'Issue: ' +
(this.state.issueUrl.length > 0 ? this.state.issueUrl : 'No issue link given'); (this.state.issueUrl.length > 0 ? this.state.issueUrl : 'No issue link given');
@ -93,7 +100,7 @@ export default class BugReportDialog extends React.Component {
this.setState({ issueUrl: ev.target.value }); this.setState({ issueUrl: ev.target.value });
} }
_onSendLogsChange(ev) { _onSendLogsChange(ev) {
this.setState({ sendLogs: ev.target.checked }); this.setState({ sendLogs: ev.target.checked });
} }

1
src/i18n/strings/en_EN.json
View file

@ -1108,6 +1108,7 @@
"Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?", "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?",
"Invite anyway and never warn me again": "Invite anyway and never warn me again", "Invite anyway and never warn me again": "Invite anyway and never warn me again",
"Invite anyway": "Invite anyway", "Invite anyway": "Invite anyway",
"Please tell us what went wrong or, better, a github issue that describes the problem.": "Please tell us what went wrong or, better, a github issue that describes the problem.",
"Preparing to send logs": "Preparing to send logs", "Preparing to send logs": "Preparing to send logs",
"Logs sent": "Logs sent", "Logs sent": "Logs sent",
"Thank you!": "Thank you!", "Thank you!": "Thank you!",

4
test/components/structures/GroupView-test.js
View file

@ -187,7 +187,7 @@ describe('GroupView', function() {
const avatarImgElement = ReactDOM.findDOMNode(img); const avatarImgElement = ReactDOM.findDOMNode(img);
expect(avatarImgElement).toBeTruthy(); expect(avatarImgElement).toBeTruthy();
expect(avatarImgElement.src).toContain( expect(avatarImgElement.src).toContain(
'https://my.home.server/_matrix/media/v1/thumbnail/' + 'https://my.home.server/_matrix/media/r0/thumbnail/' +
'someavatarurl?width=28&height=28&method=crop', 'someavatarurl?width=28&height=28&method=crop',
); );
@ -265,7 +265,7 @@ describe('GroupView', function() {
expect(longDescElement.innerHTML).toContain('<ul>'); expect(longDescElement.innerHTML).toContain('<ul>');
expect(longDescElement.innerHTML).toContain('<li>And lists!</li>'); expect(longDescElement.innerHTML).toContain('<li>And lists!</li>');
const imgSrc = "https://my.home.server/_matrix/media/v1/thumbnail/someimageurl?width=800&amp;height=600"; const imgSrc = "https://my.home.server/_matrix/media/r0/thumbnail/someimageurl?width=800&amp;height=600";
expect(longDescElement.innerHTML).toContain('<img src="' + imgSrc + '">'); expect(longDescElement.innerHTML).toContain('<img src="' + imgSrc + '">');
}); });