Merge branch 'master' of github.com:symphonyoss/SymphonyElectron

This commit is contained in:
Vishwas Shashidhar 2020-06-04 11:43:36 +05:30
commit 49764d5e9d
3 changed files with 3 additions and 3 deletions

View File

@ -120,7 +120,7 @@
"browserify": "16.5.1",
"cross-env": "5.2.0",
"del": "3.0.0",
"electron": "9.0.0",
"electron": "9.0.2",
"electron-builder": "22.7.0",
"electron-builder-squirrel-windows": "20.38.3",
"electron-icon-maker": "0.0.4",

View File

@ -479,7 +479,7 @@ export class WindowHandler {
this.mainWindow.webContents.send('welcome', {
url: userConfigUrl || this.startUrl,
message: '',
urlValid: false,
urlValid: !!userConfigUrl,
sso: false,
});
}

View File

@ -100,7 +100,7 @@ export default class Welcome extends React.Component<{}, IState> {
* @param _event
*/
public updatePodUrl(_event): void {
const url = _event.target.value;
const url = _event.target.value.trim();
const match = url.match(/(https?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/g) != null;
if (url === 'https://[POD].symphony.com' || !match) {
this.updateState(_event, {