OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Set display URL from wurl if curl not specified.

pull/21833/head
Richard Lewis 2017-07-27 16:42:29 +01:00
parent 8e4f1f0989
commit 9ee1f3962d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/elements/AppPermission.js
View File

@ -21,7 +21,10 @@ export default class AppPermission extends React.Component {
if(searchParams && searchParams.get('url')) { if(searchParams && searchParams.get('url')) {
curl = searchParams.get('url'); curl = searchParams.get('url');
} }
curl = curl || wurl; if (!curl && wurl) {
wurl.search = wurl.query = "";
curl = wurl.format();
}
return curl; return curl;
} }
@ -32,7 +35,7 @@ export default class AppPermission extends React.Component {
<img src='img/warning.svg' alt='Warning'/> <img src='img/warning.svg' alt='Warning'/>
</div> </div>
<div className='mx_AppPermissionWarningText'> <div className='mx_AppPermissionWarningText'>
<span className='mx_AppPermissionWarningTextLabel'>Do you want to load widget from URL?:</span> <span className='mx_AppPermissionWarningTextURL'>{this.state.curl}</span> <span className='mx_AppPermissionWarningTextLabel'>Do you want to load widget from URL:</span> <span className='mx_AppPermissionWarningTextURL'>{this.state.curl}</span>
</div> </div>
<input <input
className='mx_AppPermissionButton' className='mx_AppPermissionButton'